Revert "ACCUMULO-2490 Make Pair API more generics-friendly"

This reverts commit 053e83fc4225969efda31ee4957651640cc7ac9e.
ACCUMULO-2492 add time for zookeeper propogation
Merge branch '1.6.0-SNAPSHOT'