[18.03 backport] Fix TestValidRemoteDriver GetCapabilities errors#2399

euanh merged 2 commits intomoby:bump_18.03moby/libnetwork:bump_18.03from

thaJeztah:18.03_backport_fix_TestValidRemoteDriverthaJeztah/libnetwork:18.03_backport_fix_TestValidRemoteDriverCopy head branch name to clipboard