Merge "Fix cinder test cases when cinder extensions are in use"