Revert "Since we include Kite there's no need to also include CDK deps"

This reverts commit 96e4f3559fd6207edf06accf9c0b2b4ff6071d62.
Use CDH5 instead of CDH4, e.g. to avoid pulling in CDK or wrong Hadoop transitive deps