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