Merge "Moved Cinder QOS tests to admin directory"