Sync db.models.Quota* with migrations.

Blueprint: db-sync-models-with-migrations

Change-Id: Ic97690b650151eb7086cbd40093c0f3c373133e2
Merge "Sync db.models.Quota* with migrations."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp