Fixes

Various fixes for issues uncovered while testing the new CI pipeline for Supermarket.

/cc @opscode/release-engineers @smith