MDL-41778 fix codesniffer issues