Merge "Add an internal test method for rebooting a server"