Plus some edits as suggested by @jamtur01 Closes #3636 Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: 83f0f46b7c0475ae1da329cd97a8c0a67bdc2a6a Component: engine