DS-1576 fix names of LDAP configuration properties
DS-1581 Prevent double-up of restriction message
DS-1581: fix last commit