Issue #3418404: Fixed the issues reported by PHPCS and also the Drupal coding standards.
started a merge train
merged