Reduce dependencies on kie-wb-common and guvnor to minimum following upstream fix