Merge branch 'hotfix/1.5.4.1'
Bump version to 1.6.0
Merge branch 'release/1.6.0'
Merge branch 'master' into develop
Release 1.6.0 of UAA
Bump version to 1.6.1-SNAPSHOT for development