ACCUMULO-1009 moved ClientConfiguration into public API and removed its usage of AccumuloConfiguration
ACCUMULO-1866 avoid using ServerConfigurationUtil in server code
ACCUMULO-1866 Add missing deprecation annotations
ACCUMULO-1852 Fix native maps on OS X 10.9
Merge branch '1.6.0-SNAPSHOT'