clearing issues in prep to merge drupal 7.27