Removed all uses of deprecated API.
Removed deprecated API. Definitions are retained on the deprecated branch.
Merge branch 'master' into scala-2.11.x