Merge branch 'release/1.1.2'
Allow identity.version to pick out UAA to run with tomcat

Change-Id: I94437b2b4fd6428d1df017113f67921a972b4752
Merge branch 'hotfix/guide'

Change-Id: Ie53b54801928c320f11e6e6c720c7de15784cf3e
Merge branch 'release/1.2.0'
Fixed the appearance of the delete button on the approvals page

Change-Id: I1cfdb41bfe772bbd4f78072eabf7b873778def7d
Merge branch 'develop'

Change-Id: Ic3448dfe0f208a633d9d49da79547fa7edcc06c7