Always prefer the rfc2184-encoded parameters over non-encoded parameters of the same name

Fixes issue #24