US534 - Tests for properties files
Merge branch 'development' into development-work

Conflicts:
	c3/conf/cy/preview.cy.properties