Merge "Adding exceptions for File system permission test" into jb-mr2-dev