ACCUMULO-1778 added utility for obtaining monitor location
ACCUMULO-1752 Added 10 second timeout if Zookeeper process fails during MAC start
ACCUMULO-1781 Adding miniDFS support to MACRunner. Adding sample property file
ACCUMULO-1781 Adding license header to minicluster.properties
Merge branch '1.5.1-SNAPSHOT'

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

Conflicts:
	test/system/auto/simple/bulk.py
	test/system/auto/simple/compaction.py
ACCUMULO-1451 making major compaction configurable
ACCUMULO-1451 make class selection dynamic, and add license headers
ACCUMULO-1451 add functional test of the configurability of the compaction strategy
ACCUMULO-1784 fix minimum block size complaint for hadoop-2.2.0
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java

Merging ACCUMULO-1786 is a no-op because of ACCUMULO-1664. Processes are
able to use random ports and MAC already does in 1.6.0-SNAPSHOT, so
there's no need to do anything special in the test.
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

I had fixed this in master when resolving the merge conflict, but not in
1.5.1
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

ACCUMULO-1637 Expanding the tests to account for the VolumeManager
changes in 1.6
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	server/src/test/java/org/apache/accumulo/server/tabletserver/TabletServerSyncCheckTest.java
ACCUMULO-1788 fix test, use the right filesystem to create/delete a _tmp file
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
ACCUMULO-1732 fix AccumuloInputFormatIT
Merge branch '1.5.1-SNAPSHOT'
ACCUMULO-1451 from feedback from [~kturner], removed concept of passes, multiple output files, made interface abstract class, moved rules for USER and CHOP into tablet