Merge "Fix reference to cockroach docker image"