Rebased by @estesp Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com> Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> Upstream-commit: 858fad37954b198bb90aed36017b80b38ea88c1d Component: engine