add customized code to workaround acegi ldap authentication
fix all conflicts