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

This commit is an adaption of the backport to 1.4.x, adapted due to files moving
between the releases.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT