Issue #262 Drupal 7.28 release backports

PR for https://github.com/backdrop/backdrop-issues/issues/262

Replacement PR for https://github.com/backdrop/backdrop/pull/342