Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
ACCUMULO-3229 Format long as decimal integer, not floating-point
Merge branch '1.5' into 1.6
Merge branch '1.6'