ACCUMULO-3213 Fix hadoop 1 support.
Merge branch '1.6'
ACCUMULO-3213 Enable GC_FILE_ARCHIVE in MAC properties for ITs.
Merge branch '1.6'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
ACCUMULO-3213 Changed deprecation warning suppression from method to variable for ctubbsii
Merge branch '1.6'