klient/tunnel: merge in all Options fields
klient/tunnel: merge in all Options fields

gokmen/koding,alex-ionochkin/koding,rjeczalik/koding,drewsetski/koding,usirin/koding,cihangir/koding,jack89129/koding,sinan/koding,rjeczalik/koding,sinan/koding,jack89129/koding,jack89129/koding,koding/koding,acbodine/koding,usirin/koding,usirin/koding,usirin/koding,koding/koding,jack89129/koding,gokmen/koding,usirin/koding,sinan/koding,sinan/koding,kwagdy/koding-1,acbodine/koding,gokmen/koding,kwagdy/koding-1,andrewjcasal/koding,szkl/koding,rjeczalik/koding,andrewjcasal/koding,rjeczalik/koding,rjeczalik/koding,koding/koding,szkl/koding,kwagdy/koding-1,acbodine/koding,sinan/koding,alex-ionochkin/koding,acbodine/koding,kwagdy/koding-1,mertaytore/koding,cihangir/koding,drewsetski/koding,usirin/koding,drewsetski/koding,koding/koding,mertaytore/koding,sinan/koding,kwagdy/koding-1,mertaytore/koding,szkl/koding,cihangir/koding,kwagdy/koding-1,andrewjcasal/koding,andrewjcasal/koding,koding/koding,sinan/koding,usirin/koding,alex-ionochkin/koding,drewsetski/koding,szkl/koding,drewsetski/koding,gokmen/koding,acbodine/koding,cihangir/koding,acbodine/koding,koding/koding,szkl/koding,andrewjcasal/koding,jack89129/koding,jack89129/koding,cihangir/koding,rjeczalik/koding,cihangir/koding,kwagdy/koding-1,drewsetski/koding,alex-ionochkin/koding,mertaytore/koding,andrewjcasal/koding,cihangir/koding,mertaytore/koding,alex-ionochkin/koding,koding/koding,jack89129/koding,szkl/koding,mertaytore/koding,mertaytore/koding,gokmen/koding,alex-ionochkin/koding,gokmen/koding,cihangir/koding,rjeczalik/koding,gokmen/koding,koding/koding,kwagdy/koding-1,rjeczalik/koding,alex-ionochkin/koding,andrewjcasal/koding,andrewjcasal/koding,gokmen/koding,drewsetski/koding,drewsetski/koding,mertaytore/koding,alex-ionochkin/koding,szkl/koding,acbodine/koding,szkl/koding,usirin/koding,sinan/koding,acbodine/koding,jack89129/koding