ACCUMULO-3084 just warn about long timer delays
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
ACCUMULO-3087 Attempt to expand shortname to FQDN.

This should make start-server.sh a bit more resilient
against thinking it needs to SSH around. Instead of having
to match exactly what `hostname` is returning, this should
prevent an (unnecessary) SSH just because hostname is returning
the short instead of full, or vice versa.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

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

Conflicts:
	assemble/bin/start-server.sh
	assemble/bin/stop-server.sh
ACCUMULO-3078 made some more ITs rely on a Connector where possible instead of a MAC instance
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
ACCUMULO-3097 Add some class-level javadoc for some iterators.

Formatter also fixed some whitespace issues.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3098 fix timeout
ACCUMULO-3098 fix timeout
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3096 stopped retrying metadata updates on contraint violations
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-3096 stopped retrying metadata updates on contraint violations
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3101 Increase timeout for some of ExamplesIT tests on multinode

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-1957 per-table durability settings