CDB-1747 Fix error when changing user quotas
Merge CDB-1747 into release/2.9.2