ACCUMULO-2676 Make minicluster ZooKeeper startup wait time configurable

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java