Closing this in favour of #2933504: Fix coding standard issues for 8.x-1.1.