Fixed problems with CDH3 java build