Revert "fix missing ENV VAR"

This reverts commit 32f9bed24d84b793de4e472f4a2a7a248d160e16.
Revert "update uaa & login to use vcap-common/bin/cf-registar"

This reverts commit 28ab797b8e99087e0ca92f52f0095bf386d09e47.