ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
ACCUMULO-2182 Backport of ACCUMULO-2104 and ACCUMULO-2106 to 1.4.x