added all the necessary changes to compile with CDH3
updated the cdh3 commit