BZ-1018535: kie-commons and uberfire merge

Conflicts:
	jbpm-services/jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/support/NoCDISupportProcessTest.java
fixing import