Merge "DO NOT hardcode mvn staging server id"