Merge branch 'GF-54911-RC-fixes' of github.com:enyojs/enyo

Conflicts:
	CHANGELOG.md