fix #8973 - presets: allow `text` attribute on `optional` item to set custom text + fix traffic_light/pedestrian corssing (modified patch by skyper)

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