Merge "Stop using sudoers on all servers defined"