simple_one_for_one now covers the 'terminate' case properly
merge bug23958 into default
Merge heads