Removed deprecated names that had been warned for 5 years#2

nobu merged 1 commit intoruby:masterruby/timeout:masterfrom

nobu:deprecatenobu/timeout:deprecateCopy head branch name to clipboard