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'
ACCUMULO-2707 Remove vestigial build-helper execution

  Remove unneeded execution of the build-helper-maven-plugin leftover after
  ACCUMULO-2606
ACCUMULO-2715 Fix findbugs integer comparison warning in examples
ACCUMULO-2718 Make two test method names vary by more than case
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2714 Roll back test module guava dependency

Bumping to guava 15 breaks MiniDFSCluster. Need to pull it back when
we're running hadoop in the same process as accumulo to avoid our
version of guava not containing something that hadoop needed.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2720 Address some HTTP response splitting

  URLEncode some parameters, and do some validation on redirects in the monitor
  to mitigate HTTP response splitting vulnerabilities identified by FindBugs.
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
ACCUMULO-2728 Ensure rand int is positive for VolumeUtil
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2729 check conditional mutation status in RW test