Issue #3366420: \Drupal calls should be avoided in classes

Alberto Padernorequested to merge
issue/block_class-3366420:3366420-avoid-drupal-calls into 2.0.x

Closes #3366420

Merge request reports