see #8847, fix #8961 - rendering of `power=plant`, deprecation of `power=station`

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