ACCUMULO-2654 Remove introduced warnings from previous commit
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
ACCUMULO-2723 Put test in correct location

  Introduced by ACCUMULO-2631 bad merge
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2523 TabletTime.maxMetadataTime NPE if both arguments are null

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'