fix #8975 - Add `toilets:disposal` and other minor improvements to toilet preset (patch by brycenesbitt)

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