Merge branch 'domain_quota_driver_merged' of https://github.com/tellesnobrega/nova into domain_quota_driver_merged

Conflicts:
	nova/db/sqlalchemy/api.py
	nova/tests/db/test_db_api.py
Merge branch 'domain_quota_driver_merged' of https://github.com/tellesnobrega/nova into domain_quota_driver_merged