Issue #3350785 by urvashi_vora, kkalashnikov, apaderno, VladimirAus: Fix the issues reported by phpcs
mentioned in commit 224213ea