Merged upstream configuration (comments and line ordering only)
Removed NDS mapping [tracker #1647]
Migrated locking to Script class and cleanup
Moved account related LDAP objects from app-openldap [tracker #1646]
Merge branch 'master' of github.com:clearos/app-openldap-directory
Continued moving account related LDAP objects from app-openldap
Merge branch 'master' of github.com:clearos/app-openldap-directory