PLF-6082 Upgrade version of maven-parent-pom to 14-SNAPSHOT
Merge branch 'master' into feature/skin-module

Conflicts:
	pom.xml