Update to reflect AG-master pom changes