Drupal 7 meta 3 #135 from 12 11

Applied each patch starting from the bottom of the list, and then ones that applied straight (immediately and cleanly) were committed on this branch. Did not get through the full list. The purpose of this is to trim the list down so it looks more manageable to tackle.