ACCUMULO-3446 Fix compilation.
Merge branch '1.5' into 1.6

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
	server/master/src/main/java/org/apache/accumulo/master/state/SetGoalState.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
	server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
	server/src/main/java/org/apache/accumulo/server/master/Master.java
	server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Merge branch '1.6'

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
	server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
	server/master/src/main/java/org/apache/accumulo/master/Master.java
	server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
	server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
	server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java