ACCUMULO-2265 fixing copyright notice
ACCUMULO-1772 If at table load time volume is no longer configured, then choose another
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
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'
ACCUMULO-1479 Simplification of namespace support in SecurityOperation
ACCUMULO-2121 remove client. prefix from ClientConfiguration properties
Revert "ACCUMULO-1479 Simplification of namespace support in SecurityOperation"
Didn't mean to commit this

This reverts commit 8cce1fdc3de13471f7dff00f7d18c7d78d8f968f.
ACCUMULO-2260 removing table copy flag from createnamespace
ACCUMULO-2266 Checking hdfs minimum block size and failing if it clashes with walog max size
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
ACCUMULO-2210 Closing socket after checking on on Zookeeper
ACCUMULO-2144 fixed listcompactions and listscans so they no longer wrap the appropriate exceptions in RTEs
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Merge branch '1.6.0-SNAPSHOT'