Add deprecated flag to methods that are removed in 3.0.

A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.

Refs #3105
Merge branch 'master' into 2.5