Merge "Fixes devstack ldap plugin"