Corrected drupal coding standard issues. Synced drupal github version.