Initial changes for Hadoop 1 + 2 support