Update pom.xml
Merge branch 'master' into cdh4.5.0_giraph1.0.0