tunnel-clients.yml

Patch fixes issue where custom tunnel-clients.yml file overrides are ignored due to params passed in the wrong order to custom deep_merge function.