Control the removal of directories from within the project in order to avoid too many PRs for cf-release
Implement usage of
 - build matrix
 - stand alone tomcat (starts 4 times faster than plugin)
 - make sure DBs are clean
 - cleaner and more readable .travis.yml file
Build completes in 7 minutes instead of 20-25 minutes
Merge branch 'feature/faster-build-matrix' into develop
Set a default directory for exploded directory to avoid a directory called ${war.exploded.dir} being created by the IDE.
https://www.pivotaltracker.com/story/show/67243394
https://www.pivotaltracker.com/story/show/67243430
https://www.pivotaltracker.com/story/show/67243374
https://www.pivotaltracker.com/story/show/66962922
Merge branch 'feature/transaction-client-updates' into develop
Generate unique client ID and secret, as well as email for tests to avoid collisions with legacy tests that leave data behind in the database.
Use the SpringJUnit4ClassRunner for ScimUserEndpointsMockMvcTests

Built a ContextLoader and default java config for integration tests, so that we can have @Autowired tests
Properly clean the approvals table to avoid errors like

Results :
Failed tests:   approvalsIsSyncedCorrectlyOnCreate(org.cloudfoundry.identity.uaa.scim.endpoints.ScimUserEndpointsTests): expected:<1> but was:<2>

Tests run: 227, Failures: 1, Errors: 0, Skipped: 1
https://www.pivotaltracker.com/story/show/68154722
Revoke approvals upon deletion of a client.
Allow to override log level using a system variable
Revert "Allow to override log level using a system variable"

This reverts commit df4a7dffda5a61044740d3d3a7e46fb8a9eea5f0.
https://www.pivotaltracker.com/story/show/68154722
Add in unit tests to verify that deletes also delete approvals
ensure approval deletion is rolled back too
Add a test for updating a user in ScimUserEndpointsMockMvcTests
Add the password reset endpoint

users are retrieved by email, and their user id is embedded in the expiring code

In cloud foundry, the user's email matches their username. By using the email field, we avoid the need to validate the username as an email before attempting to send to it.  This also maintains consistency with the forgot password page UI, for other uaa deployments
Add a password_change endpoint

The existing ScimUserEndpoints do not expose password change functionality.  Rather than expand their scope, a specific password_change endpoint has been added, only accessible by the login server
Merge branch 'feature/reset_password_api' into develop
https://www.pivotaltracker.com/n/projects/997278/stories/67714674
Reapplying the DDL to postgres to bring legacy databases up to date requires that we do it without a transaction.
https://www.pivotaltracker.com/n/projects/997278/stories/67714674
Reapplying the DDL to postgres to bring legacy databases up to date requires that we do it without a transaction.

Conflicts:

	common/src/main/resources/spring/data-source.xml