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

Conflicts:
	CHANGELOG.md
Merge pull request #599 from enyojs/GF-54911-RC-fixes

Merge branch 'GF-54911-RC-fixes' of github.com:enyojs/enyo

Reviewed-By: Ben Combee (ben.combee@lge.com)