Merge branch 'fix-deprecations-cops-ee' into 'master'

Fix DeprecatedClassMethods lints specific to EE

In anticipation of a CE => EE merge.

See CE merge request gitlab-org/gitlab-ce!4087.

See merge request !399