`UriTemplate.with(…)` should not only append variables at the end

[odrotbohm]

Back port of #2036.