GIRAPH-704: Specialized message stores (majakabiljo)
GIRAPH-705: Type converters and giraph-hive cleanup (nitay)
Merge remote-tracking branch 'origin/trunk' into jython-scripts

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
	giraph-core/src/main/java/org/apache/giraph/jython/JythonUtils.java
	giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java
	giraph-core/src/test/java/org/apache/giraph/jython/TestJython.java
Merge remote-tracking branch 'origin/trunk' into factories

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/InMemoryMessageStoreFactory.java
Merge branch 'jython-scripts' into dev

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
	giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/InMemoryMessageStoreFactory.java
	giraph-core/src/test/java/org/apache/giraph/jython/TestJython.java
	giraph-hive/src/main/java/org/apache/giraph/hive/common/HiveUtils.java
	giraph-hive/src/main/java/org/apache/giraph/hive/types/TypedValueReader.java
	giraph-hive/src/main/java/org/apache/giraph/hive/types/TypedValueWriter.java
	giraph-hive/src/main/java/org/apache/giraph/hive/types/TypedVertexIdReader.java
	giraph-hive/src/main/java/org/apache/giraph/hive/types/TypedVertexIdWriter.java
Merge branch 'factories' into dev

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/InMemoryMessageStoreFactory.java
GIRAPH-710: Define zookeeper version in a property to allow build time override (apurtell via nitay)
Merge remote-tracking branch 'origin/trunk' into dev