Merge "Fix consistency groups test credentials"