Merge remote-tracking branch 'origin/trunk' into jython-scripts
GIRAPH-709: More flexible Jython script loading
GIRAPH-708: Factories for creation of all IVEM types (nitay)
Merge remote-tracking branch 'origin/trunk' into jython-scripts

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/graph/GraphTaskManager.java
	giraph-core/src/main/java/org/apache/giraph/jython/JythonComputationFactory.java
Merge branch 'jython-scripts' into dev

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/comm/ServerData.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/ByteArrayMessagesPerVertexStore.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/InMemoryMessageStoreFactory.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/MessageStoreFactory.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/OneMessagePerVertexStore.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/out_of_core/DiskBackedMessageStore.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/out_of_core/PartitionDiskBackedMessageStore.java
	giraph-core/src/main/java/org/apache/giraph/comm/messages/out_of_core/SequentialFileMessageStore.java
	giraph-core/src/main/java/org/apache/giraph/conf/ImmutableClassesGiraphConfiguration.java
	giraph-core/src/main/java/org/apache/giraph/factories/AbstractMessageValueFactory.java
	giraph-core/src/main/java/org/apache/giraph/factories/DefaultIncomingMessageValueFactory.java
	giraph-core/src/main/java/org/apache/giraph/factories/DefaultOutgoingMessageValueFactory.java
	giraph-core/src/main/java/org/apache/giraph/factories/MessageValueFactory.java
	giraph-core/src/main/java/org/apache/giraph/factories/TestMessageValueFactory.java
	giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java
	giraph-core/src/test/java/org/apache/giraph/comm/TestMessageStores.java