Update to next version snapshot

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>
Cope with docker API change (Id / ID)
Fix some client tests

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>