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.6.1-SNAPSHOT'
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'
Merge branch '1.6.1-SNAPSHOT'
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
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
Merge branch '1.6.1-SNAPSHOT'