Merge "fs_config supports shell wildcard patterns"