Cherry-pick fixes from master to jethro

Created by: jviguera

Hi @sbabic

This pull-request pulls in most of the current fixes in master into Jethro.

Please consider merging it, so meta-swupdate layer can be more easily used along with other layers stuck in Jethro branch.

-- jviguera