Merge "Traverse /etc/init in a well-defined order" into nyc-mr1-dev