Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com> Upstream-commit: 849e55f4e499f729e7e63ca2b20f3371a8e15d86 Component: engine