ACCUMULO-2125 fix deprecated warnings
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2167 removed deprecation from ZooKeeperInstance(String, String) constructor