Merge "fs_config: move sort to be consistent with other sort"