BZ-1018535: kie-commons and uberfire merge
BZ-1018535: complement to kie-commons/uberfire merge