Issue #1468582: Followup to fix tests broken by meta tags change.
Merge branch '1.x' of github.com:backdrop/backdrop into 1.x