Merge branch 'release/1.4.6'
Merge branch 'master' into develop
1.4.7 release of the UAA
Merge branch 'release/1.4.7'
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
Update UAA-APIs.rst

Without the quotes you will receive a "Invalid filter expression" error.
PR https://github.com/cloudfoundry/uaa/pull/69