Merge "Remove sbin from fs_config.cpp"