Pull in the following upstream commits for both CentOS and Debian:
7824b13db9/
270709323a/
dadd2593c7/
e8dc364f9f/
See the patches themselves for more details.
Closes-Bug: 1983022
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
Change-Id: I20f18b17752588b5b031eed88b5e52fb15c830fa