Docker client - fixes 64

Fixes #64.

Part of #608, followup is #712.
That implies a service, which the current API is not setup to do right now, and I want this to be drop on in first pass to minimize changes (there's going to be a lot already in the first rip-out-gearclient branch). I'll file a follow up issue.