fix #8459 - deprecate `amenity=emergency_phone` in favor of `emergency=phone`

git-svn-id: http://josm.openstreetmap.de/svn/trunk@5742 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #8452 - add `natural=grassland`

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