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