Merge "Use new heat-docker-agents images"