Merge "Remove Valgrind entries from fs_config."