Backed out Aether related changes and got ApacheDS module to compile. Still one broken integration test to resolve.