Revert "Revert "Merge branch 'register-uaa-route-with-tls' of git://github.com/njbennett/cf-deployment into njbennett-register-uaa-route-with-tls""
Revert "Revert "Merge branch 'register-uaa-route-with-tls' of git://github.com/njbennett/cf-deployment into njbennett-register-uaa-route-with-tls""

This reverts commit 708a372e974a280b11f6938044faf2833ece28b4.

[finishes #166964417](https://www.pivotaltracker.com/story/show/166964417)
[finishes #165040176](https://www.pivotaltracker.com/story/show/165040176)

Co-authored-by: Dave Walter <00834c187f77910918b70534e2fb1dd066a04d4b@pivotal.io>
Co-authored-by: Sebastian Vidrio <68ba84219e4e2d7d15fed3ed668bd2821314e420@pivotal.io>

cloudfoundry/cf-deployment,cloudfoundry/cf-deployment