Stay consistent with predefs
Merge pull request #1201 from bcardarella/patch-1

Stay consistent with predefs
[Bugfix] Ensure error on invalid component entityName
Merge pull request #1204 from rondale-sc/fix_component_generator_entityname

[Bugfix] Ensure error on invalid component entityName
Merge remote-tracking branch 'upstream/master' into addon-api-blueprint

Conflicts:
	CHANGELOG.md