Merge "When a second database is created on an origin, ensure that the quota for that origin is large enough to cover both databases (old and new)."