ACCUMULO-1584 applying Jonathan Hsieh's patch
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT