Fix a few problems with the cli integration tests.
Fix a few problems with the cli integration tests.

This is still failing locally; at no point is this set of tests starting
a server, so I don't understand how it's even getting that far on
Travis -- maybe something earlier in the run is starting a server and
not shutting it down?

CCI-MOC/haas