Rename underscore in feature org.talend.rcp.branding.camel-feature
Merge branch 'master' into feature/SCM-239/maventupbuild

Conflicts:
	main/features/org.talend.rcp.branding.camel-feature/feature.xml
	main/features/org.talend.rcp.branding.camel-feature/pom.xml
Remove deleted feature and plugin from repo POM