fixes #2288 - changes to RHEV quota support

Or merge this if you want.