Merge "Addition of XML support to test_quotas.py"