Drop two backported patches, refresh others. (From OE-Core rev: 63c7bf399f31420374866dc050a52e9c0700cdbd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>