Remove @Inject references because they confuse JEE containers

Change-Id: I2e4a8e7424e7c62d1e89ca62a91423fdf3e36ac8
Fix LDAP port and bind regressions due to change for issue-343

Change-Id: I76ee581e067a30fb1656c5c62bdf743846f1a767