ACCUMULO-2804 Remove plexus-utils dependency.
ACCUMULO-2805 exclude unused transitive dep.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2790 generate_monitor_certificate.sh fails on OSX
ACCUMULO-2768 Agitator not restarting all datanodes
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2770 Add utility to read local WAL

Forward port the upgrade code from 1.5.x into a separate utility so
that a user can still read local WALs if they happen to be around.

Recreate LogFile{Key,Value} in their old packages so that we can still
read the old sequence files that have embedded class names.

Modify the utility to optionally accept values as command line options
instead of searching around in the configuration settings. Testability!

Add a WAL file explicitly generated under 1.4 for testing purposes.

Add documentation to the troubleshooting guide to describe usage.

Recover your logs
After something has gone wrong
Watch your flowers bloom

commit 2db5ce6186e32c451328154b024951cc5090505f
Author: Eric C. Newton <ecn@apache.org>
Date:   Tue Jun 5 13:18:22 2012 +0000
ACCUMULO-2807 Use deprecated SequenceFile.Reader

Use the old method
Of creating a reader
To retain compat
ACCUMULO-2764 Wrap the MAC process termination in a Callable to get timeout semantics
ACCUMULO-2813 Basic log4j appender configuration for new server modules at test time.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
ACCUMULO-2814 Specify absolute directory in test

In a real accumulo deployment we re-resolve relative paths based on
ACCUMULO_HOME, which is good, but in test scenario having it set just
messed things up.
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT
ACCUMULO-2758 Remove non-observed offset argument from private encodeColumnFamily method

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
ACCUMULO-2761: Add regex to remove everything after the last slash
ACCUMULO-2811: Move directory creation to the constructor so that the directory creation is only attempted once. Check that the directory does not exist first.
ACCUMULO-2818 Create standard keystore for Jetty

  Ensure keystore password is the same as the password for the default key it
  holds. Remove extraneous parameter for truststore generation.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT