Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: cd4f507b42e800d148b211ca2c780d01192a9041 Component: engine