Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorization
Merge pull request #318 from fanf/bug_3829/ldap_authz_broken

Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorizations
Revert "Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorization"

This reverts commit efbf99c8e30fdfc9cf215ccf230ca0a3676cb4bf.
Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorization
Merge pull request #320 from fanf/bug_3829/ldap_authz_broken

Fixes #3829: allow LDAP authentication mixed with rudder-users.xml defined authorizations
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfigAuth.scala