let CircleCI push deploy image to Docker on master

This adds ~4min to a test on the master branch but builds the cockroachdb/cockroach image.

Add two (very small) fixes.