Merge "Traverse /etc/init in a well-defined order"