ACCUMULO-1795 make the default hadoop version consistent to avoid confusion
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
ACCUMULO-1932 Add in a configuration for the Accumulo user, and then make sure we exec the magitator as that user so we
don't restart the master and gc as root.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT