Merge "Replaced deprecated tag in a1-controller pom"