Login Server Release 1.8.5 & UAA Release 1.8.3 - Take 2

- Login Server Release 1.8.5
- UAA Release 1.8.3
- Ability to specify multiple SAML providers in manifest
- Deprecate uaa.login.client_secret - but still be backwards compatible
- Ability to override default user scopes through manifest
- Make login client redirect-uri be based on the login.protocol property
- Upgrade to Apache Tomcat 7.0.55 for both UAA and Login Server jobs


Correct, backwards compatible so that those that are using the `uaa.login.client_secret` can still merge manifests