Merge "Skip read-only test for CIFS"