Merge branch 'release/1.4.6'
Merge branch 'master' into develop
1.4.7 release of the UAA
Merge branch 'release/1.4.7'
small optimization if the authorities field is being used then avoid making a 2nd query for authorities
Just like the login-servers, by default we should be drawing upon the classpath, and then override for configuration options
Properly reset changed value during single unit test. Should prevent failure
https://travis-ci.org/cloudfoundry/uaa/builds/17447689
clean db prior to test start. should not be needed, but can not hurt
https://www.pivotaltracker.com/story/show/62747902
Add verified attribute to user object. Can be used by 3rd party application to flag if a user is considered 'verified' such as an email confirmation.
Default value is false for new users, true for existing users created prior to this feature.
UAA or login server do not use this field at this time.
User can be verified using a regular /Users/{id}/ POST to update, or a GET to /Users/{id}/verify
Fix unit test, the behavior was modified to allow the server to startup without issues.
correctly verify that nothing has changed
non default profile assumes strong passwords
oauth.approvals is a default group for every user
properly use correct defaults for unit testing.
username/password is provisioned per environment and should not be assumed
postgresql-eclipse has addnew: true configured
Since we locked down the /approvals endpoint to only be used by the login client, user's don't need to add an approval as it is to get tokens. it is implicit in the flow through user_oauth_approval parameter.
The test user should have the oauth.approvals scope, and then we can implement happy day flow to test.
remove some more not needed debug at startup
1.5.0 release of the UAA
Merge branch 'release/1.5.0'

Conflicts:
	common/pom.xml
	pom.xml
	samples/api/pom.xml
	samples/app/pom.xml
	samples/pom.xml
	scim/pom.xml
	uaa/pom.xml
fix merge failure
advance version forward