Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' into GIRAPH-OOC
Merge branch 'GIRAPH-OOC' of github.com:armax00/giraph into GIRAPH-OOC
fix logic to initialise sticky partitions