Merge with latest JAGGR code. Change in pom.xml files