Dependency and code changes to move from CDH 4.x to CDH 5.2.0