XCOMMONS-670: ConcurrentModificationException during upgrading subwikis
* various bulletproofing