Fixes per tenant quota doesn't work

Fixes bug 1101331

Change-Id: I9c4e88b437506ed5818ee56ff6fd70588cb0f965
Merge "Fixes per tenant quota doesn't work"