Update Drupal to 7.22
Two of the patches I was using for Drupal core made it into 7.22
Merge pull request #821 from sylus/master

Update Drupal to 7.22