Improve marsh/wetland/mud rendering

* Render marsh and wetland from z10 (resolves #899)
* Render labels on marsh, wetland and mud (resolves #935)