Updates to depend on latest CDAP and pom changes