Merge "Adding var for cvp-shaker image"