Using backported content from the master branch
(From yocto-docs rev: cfd9848fae96a2b047df22d1a8bd4821c3d71cbf)
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>