Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
ACCUMULO-2267 Add missing license headers.
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2455 small work arounds to increase the chance that zookeeper updates are in place before tservers need to see them
Merge branch '1.6.0-SNAPSHOT'