ACCUMULO-3009 ensure that there have been no important events between balance calls
ACCUMULO-3053 Pull include/exclude ciphers for Monitor SSL
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java
ACCUMULO-3053 Update user manual about enabling/disabling certain SSL ciphers for monitor
ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap
ACCUMULO-3045 Update user manual for CredentialProviderToken.
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	docs/src/main/asciidoc/chapters/administration.txt
	docs/src/main/asciidoc/chapters/clients.txt
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-2704 print information about dead servers
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3006 add messages to {{IllegalArgumentException}}s
ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent.
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java