Merge proposals dependent on lp://qastaging/~l3on/drupal-teams/7.x-dev_fixes

lp://qastaging/~l3on/drupal-teams/7.x-dev_fixes has no merge proposals.