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