Merge file system categories with categories from YAML.

Fixes #2527.