Docker client - fixes 64

Fixes #64.

Part of #608, followup is #712.
Reimplementing this to not do a bazillion HTTP requests would be much more of a performance win...