Upgrade UAA and login server

This PR should only be merged if PR https://github.com/cloudfoundry/cf-release/pull/313 is rejected. It ensures that the UAA and login server still get upgraded.