Fix tests for work with docker server v1.1.2
Merge remote-tracking branch 'upstream/master'