Merge "Tune sudo settings on server"