2.0.x into 2.2.x branch merge
Issue #3293007 by urvashi_vora, Rakhi Soni, Arantxio: Drupal Coding Standard As Per 'phpcs --standard=Drupal'
Issue #3293007 by urvashi_vora, Rakhi Soni, Arantxio: Drupal Coding Standard As Per 'phpcs --standard=Drupal'