ACCUMULO-2713 fixing Michael Allen's patch and adding test