Differentiate between test-local and test-ci
Merge branch 'm6' into m7
Differentiate between test-local and test-ci
Merge branch 'm7' into m8

Conflicts:
	src/main/resources/config/test-local.properties
Differentiate between test-local and test-ci