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