MGM: adding drupal and pf patches for 6.31/7.27.