apply fix for adding shared folders during the upgrade
Merge branch 'Kolab3.3'