adjust to publish workflow refactoring
Merge remote-tracking branch 'origin/master' into publishworkflow

Conflicts:
	ContentAwareFactory.php
	Tests/Unit/ContentAwareFactoryTest.php