Merge "Fix criproxy and dockershim deployment on masters"