fixes to dependencies to work with hadoop 1 and 2, additions to build test matrix