Implements the improvements suggested in the original fix for [YOCTO #1131] (From OE-Core rev: e9cde6962d369fb620799d0370ea9dc7d6234d37) Signed-off-by: <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>