change domain model to have more relationship types, therefore avoiding the need for some label checks
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'

Conflicts:
	data-import/src/main/java/com/ldbc/snb/interactive/neo4j/interactive/embedded_api_steps/Neo4jQuery2EmbeddedApi.java