[gh-495] Closes [gh-492] Upgrade drupal to 7.16