ACCUMULO-2979 Log a useful message for when the assertion fails
ACCUMULO-2423 Clean up shell scripts

Standardize interpreter line on '#! /usr/bin/env foo'
Replace `..` with $(..)
Replace [..] with [[..]]
Replace = with == in [[..]]
Replace arithmetic [[..]] with ((..))
Remove useless invocations of echo
Add double quotes to prevent word splitting
ACCUMULO-2985 Make sure the ES used to stop processes with a timeout is stopped itself.

To use a Callable to apply a timeout when trying to stop the accumulo processes
in MiniAccumuloCluster, an ExecutorService is required. A single-thread ES was added
as a part of ACCUMULO-2764, however, it was neglected to be stopped itself
which added a non-daemon'ized thread to the JVM. This non-daemonized thread
prevents the JVM from exiting cleanly.

After using the ES to stop the Accumulo processes with a timeout, we
need to be sure to stop the ES as well. Test with a Mocked ES ensures that
the ES is stopped before MAC.stop() returns.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	minicluster/pom.xml
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2978 double-check to make sure all the tablets are online
ACCUMULO-2990 minor cleanup of TSBW: sprinkled "final" and fixed security error message
ACCUMULO-2615 Refactor server configurations

* ServerConfiguration is deprecated in favor of the new ServerConfigurationFactory.
* ServerConfigurationFactory caches configurations not just but namespace or table ID, but
  also by instance ID.
* ZooConfigurationFactory takes over the creation logic from ZooConfiguration. A
  ZooConfiguration instance is no longer a singleton, but an ordinary instance.
  ZooConfigurationFactory caches created ones by instance ID.
* NamespaceConfiguration and TableConfiguration each keep a static map of ZooCache instances,
  rather than a single static instance. The map is keyed by instance ID and namespace/table
  (resp.) ID.
* getParentConfiguration() was added to all appropriate configurations.
* The logic for retrieving properties from ZooCache instances is refactored to a new
  ZooCachePropertyAccessor object.
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
	server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
ACCUMULO-2615 Update Constants.UTF8 to StandardCharsets.UTF_8 for 1.7.x+
ACCUMULO-2993 fix division by zero

When given a filename, wc will output that filename, resulting in bad
division as the shell tries to interpret path separators. Instead, we
can have wc read from stdin.
ACCUMULO-2992 Remove deprecated AccumuloConfiguration.getSiteConfiguration().
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
	core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
ACCUMULO-2985 Ensure that ES is properly initialized during start()

By initializing the ExecutorService in the constructor, I broke the ability
to stop, start, and then re-stop the minicluster. Lazily initialize the ES
in start() which should alleviate the issue.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
	minicluster/src/test/java/org/apache/accumulo/minicluster/impl/CleanShutdownMacTest.java
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2997 Adding in ticket ref.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-2999 can't quote the args as a single argument