BZ-1018535: kie-commons and uberfire merge
BZ-1018535: reverting a wrong change