Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (cherry picked from commit f962bd06ed8824d1f75d8546b428965cd61bdf7f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 5591f0b1ee7dec101b490228258613cd7caf64ee Component: engine