GIRAPH-823: upgrade hiveio to version 0.21 from olderversion 0.20 (pavanka via majakabiljo)
Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' of github.com:armax00/giraph into trunk
Revert "add check for superstep when offloading partitions"

This reverts commit 39494897a827cc06dbc9fbaa976b7d624404e15d.
Revert "ATTENTION! this modification is temporary, could be reverted"

This reverts commit 215e9e100c2884b97f6ccba0636ae9ac680557c0.
Merge branch 'trunk' into GIRAPH-OOC
fix superstep info