Merge "Add a docker pull retry to docker-puppet.py" into stable/pike