Integrating the 4.1.25 and 4.1.26 stable releases.
(From OE-Core rev: 298a3c38ac99282554b51bdc0abec2423b6ce694)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>