Merge "Change org.apache.maven.wagon version from 2.9 to 3.3.3 in cicn and hicn jobs"