Upgrading to Drupal extension 3.

#6867