Merge pull request #149 from rmansoor/master

BISERVER-8223- Fixed LDAP scenario
BISERVER-8223 - Fix compilation errors