Include two enhancement patches from Olaf Mandel <o.mandel@menlosystems.com>
(From OE-Core rev: e2a32d9a0e18dc0565d5a2d9197616ac9b338d77)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>