Biolithic drupal 7 meta 2 #134 from 2 5

Replacement pull request for https://github.com/backdrop/backdrop/pull/139 that resolves a merge conflict, updates tests, and adds in http://drupal.org/node/1541958.