Revert "Merge branch 'feature/uaa-ldap-authentication' into develop"

This reverts commit c02c9cec46a5c9462d3d10b9001ef092fae82444, reversing
changes made to 2798a0982c642a274c09f0a4ae993677b5d8115b.