ACCUMULO-3243 Add missing timeouts of transition to scalable timeout JUnit Rule.

Ported TableOperationsIT over to SimpleMacIT.
Merge branch '1.6'

Conflicts:
	test/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
ACCUMULO-3263 utility to redirect tablets to use volumes fairly
ACCUMULO-3263 utility to redirect tablets to use volumes fairly
Merge branch '1.6'