[gh-632] Upgrade Drupal Core to 7.21
Merge pull request #633 from tsteiner2/issue-632

Closes #632