Merge origin/master

current trunk is 1.2.0
this change should be reflected in pom file to work with current giraph trunk(giraph 1.2.0)