Updates following refactor of guvnor and kie-wb-common split