Branch "1.5" returns

[Josh Elser]

ACCUMULO-3939 affects only 1.5 and was asked of by a user, so I 
recreated the branch to land the fix. Hopefully we can keep a short 
cycle on 1.5.4 and try to drop it again after.

- Josh