Merge "Fix appc-clm gerrit-maven-clm job"