Bugfixes, bring it closer to 2.4.0 final release.
(From OE-Core rev: eba55c2c263af2973de612c003cc616ce3e22221)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>