fix #9332 - `addr:interpolation` support: enhance preset + avoid false positives in validator

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6393 0c6e7542-c601-0410-84e7-c038aed88b3b
Merge branch 'master' into mirror