Merge "Revert "init: Rename 'cgroups_activated' into 'fifo'""