Merge "Actually make fs_path_config / fs_path_config_from_file private"