Allow UAA URL to be optionally specified in manifest

Rebased and tested with cf-release master March 27