Manually merged rSmart pom.xml changes