fix #9017 - NPE in AbstractUploadTask.handleUploadConflict()

git-svn-id: http://josm.openstreetmap.de/svn/trunk@6199 0c6e7542-c601-0410-84e7-c038aed88b3b
fix #9023 - add `access=customers` to road restriction preset

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