4.9 backports to help enable pending CVE fixes Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>