Issue3363471: Addressed 4.1 and converted patch to PR.

Bharath Kumar Kondetirequested to merge
issue/adc_block-3363471:issue#3363471/phpcs into master

Closes #3363471

Merge request reports