Pick commits per NVD report. (From OE-Core rev: c46f841cdc8f7c1b0cce7da8fb587f65320a2163) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>