[Geoserver-devel] Merge

The config branch merge is complete. Please feel free to fix any bugs you may find (yes I may have created a few ..., appologies in advance). Richard, if you're working from home please go onto the head.

David