ACCUMULO-2261 remove unexpected future and loc entries for dead servers from the metadata tables
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2261 cherry pick back 1.5
ACCUMULO-1961 removing trivial warnings
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
	server/src/main/java/org/apache/accumulo/server/master/Master.java
Merge branch '1.6.0-SNAPSHOT'