Fix uaa.yml.erb and cf-properties.yml to allow uaa ldap config

A spec for uaa.spring_profiles existed, but never worked because
the property was never present in cf-properties.  It is now
removed.

[#75285350] https://www.pivotaltracker.com/story/show/75285350

Signed-off-by: Philip Kuryloski <pkuryloski@pivotallabs.com>
Merge remote-tracking branch 'origin/pr/456' into develop