ACCUMULO-3224 Use nanoTime in the shell's auth timeout
Merge branch '1.5' into 1.6
Merge branch '1.6'