switching to use limits instead of quotas

Fixes bug 1178694

Change-Id: I6fad061faf84079492338016fd2bada9a2e434f3
Merge "switching to use limits instead of quotas"