Merge "Don't allow userID changes on upgrade" into nyc-dev