The deprecated ApacheDS classes should be marked for removal in 7.0

We should also document in "Preparing for 7.0" to stop using ApacheDS.