fix #8875 - update JOSM key for OAuth, smooth transition for old key.

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6076 0c6e7542-c601-0410-84e7-c038aed88b3b
better style

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