Merge "Don't reuse userids that are being cleaned up on boot" into nyc-mr1-dev