Merge branch 'trunk' into GIRAPH-OOC

Conflicts:
	giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java
Merge branch 'GIRAPH-OOC' of github.com:armax00/giraph into GIRAPH-OOC

Conflicts:
	giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java
Merge branch 'GIRAPH-OOC' of github.com:armax00/giraph into GIRAPH-OOC
Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' into GIRAPH-OOC
fix diff errors