Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
ACCUMULO-3448 Break out to avoid the default case.

Cherry-pick of 148e293acce79dcf02fe4bf13a221bf5881dd326 because I forgot
that it needed to be made in 1.6, and not just master.
Merge branch '1.6'