Changes to uniform version with CDH4.6 dependencies.
Merge remote-tracking branch 'cba/master'