Initial support for compiling against CDH5
Merge branch 'master' into cdh3