Misc additions/changes for kie spring and kie aries blueprint