Biolithic drupal 7 meta 2 #134 from 2 6

Replacement PR for https://github.com/backdrop/backdrop/pull/141, fixing tests.

This backports several issues from the D7 list at https://github.com/backdrop/backdrop-issues/issues/134.