Fold login-server-common into login-server

https://www.pivotaltracker.com/story/show/69853932