Merge branch 'ldapplugin'

* ldapplugin:
  Adding engine/storage/integration-test/test-output to gitignore for Ian
  New LDAP UI
  Merge LDAPPlugin