Merge "Move cockroach image to defaults"