Revert "CDH 5.1.0"

This reverts commit 6cfcaadb31b263fba9fe61f19caab432ee758244.
Merge branch 'csd-1.1' of github.com:markhamstra/spark into csd-1.1