[GEOS-5634] enabling 'disk quota' causes disk quota page to bug-out, and [GEOS-5633] Disk quota never goes down
Clean up the old quota store when disabled, the stats are othewise going out of synch as gwc is used while the quota store is disabled
Merge branch 'master' of git://github.com/geoserver/geoserver