Solve startup conflict between nodes by restarting slave runtime
Log reason for restart
Don't restart the node, and add a comment explaining what's going on.
Cosmetic to be closer to what's on default.
merge bug25685 into stable
merge stable into default