Merge from trunk; use initscript name instead of id