ACCUMULO-3265 Add bootstrap_config.sh to README
ACCUMULO-3383 Fix for AccumuloVFSClassloader conflicting cache directories

 . AccumuloVFSClassloader no longer creates conflicting local cache directory names when vfs.cache.dir property is set.
ACCUMULO-3383 Remove unused import
Merge branch '1.6'
ACCUMULO-3340 prefer IPv4 for MAC processes

  Add system property to MiniAccumuloCluster processes:
    -Djava.net.preferIPv4Stack=true
ACCUMULO-3291 Use target instead of /tmp
Merge branch '1.5' into 1.6

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
Merge branch '1.6'

Conflicts:
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java
ACCUMULO-3405 Drop findbugs-maven-plugin to 2.5.5

  Drop findbugs-maven-plugin down to latest version that runs on Java6.
  FindBugs2 (which is used by version 3 of the plugin) requires Java7.

  This only applies to the 1.6 branch. Merging forward with -sours.
Merge branch '1.6'

  Merging with -sours for ACCUMULO-3405
Revert "ACCUMULO-1880 create mapreduce module"

This reverts commit 99baad37e86739c701821e3c09d69434236d302a.
Revert "ACCUMULO-2829 Add accumulo-mapreduce.jar to libjars in tool.sh"

This reverts commit 6fbd35d93a1f9861a529a53d0353f5457ad21493.
ACCUMULO-3402 Restore RangeInputSplitTest and remove .gitignore
ACCUMULO-3438 Log an error when AuthenticationToken converter fails.
Merge branch '1.6'