Merge "Don't start all services during upgrade steps"