BZ-1018535: kie-commons and uberfire merge

Conflicts:
	jbpm-console-ng-showcase/pom.xml
BZ-1018535: reverting a wrong change