Merge "Fix deploy.py return code"