Make mqueue container specific Upstream-commit: e6573a5d18c3045fb021668f3c7539ffa52696fe Component: engine