Ensure that the correct domain is used in uaa redirect-uri.

Change-Id: I0e1e433e8687c01f8736588a2accba11f015bda6
Merge branch 'uaa-conf-template-fix' into dev-setup-uaa-changes