ACCUMULO-3221 Ensure arithmetic happens as longs and not integers.
Merge branch '1.5' into 1.6

Conflicts:
	core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Merge branch '1.6'