fix #8996, fix #9001 - presets: add some context to common words used in different presets with distinct translations

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6191 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #9000 - add a new validator test on `barrier=entrance` not set on a barrier

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