Merge djangocms-common into aldryn-common

Merge at: https://github.com/divio/djangocms-common/commit/588dd26abb33afb618d070454e8f773a09cf0d29

Cleanup is to follow, but we need to ensure a good deprecation practice