Revert "Use a patched swarm client to allow using the -tunnel option"

In 1.22 we don't need the patched version

This reverts commit 8a9b7d77c15f5ae978079aaca6ac8f8b9d55e4c2.
Update to swarm client 1.22