Necessary tweaks for Cartridge BS3 migration

Cartridge needs these commits merged into Mezzanine to complete it's migration to BS3. Rationale inside each commit message.

Corresponding Cartridge pull request: https://github.com/clemensbasti/cartridge/pull/2