ACCUMULO-2503 Fix timezone-related failures in ShellTest
Merge branch '1.6.0-SNAPSHOT'