[#12024] Updated Drupal to 7.21

Steps to test:

- re-build and re-install