GUVNOR-2106: Improve separation of guvnor from KIE