Merge "Make minion restart timeout configurable"