added metadata entry to the node REST representation
Merge branch '1.9-maint' into 2.0-maint
Merge pull request #3118 from jexp/2.1-maint

[2.1] added metadata entry to the REST representation
Merge branch '2.0-maint' into 2.1-maint
Merge remote-tracking branch 'upstream/2.1-maint' into 2.1-maint
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint
Merge pull request #3138 from davidegrohmann/merge-2.0-into-2.1

Merge 2.0 into 2.1
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/impl/store/AbstractDynamicStoreTest.java
Merge pull request #3141 from davidegrohmann/merge-2.1-into-master

Merge 2.1 into master