Item12525: unsubscribing while still collecting subscriptions could result in total loss of unsubscriptions. Also renamed one rarely used configuration option to the correct namespace.

git-svn-id: http://svn.foswiki.org/trunk@16867 0b4bb1d4-4e5a-0410-9cc4-b2b747904278