HotFix: Database Upgrade and Collection Fix

HotFix: Database Upgrade and Collection Fix.

Reverting: 
- RiTree schema change since it's missing database upgrade script
- Change in Collections-GUID method since there is already imported collections with current GUID.