Initital versions_history_form fixes merge:

from collective.cmfeditionsdexteritycompat thanks to Rafael
Oliveira's (@rafaelbco)
Use assertIn for better failure messages
Forgot to include the grok views from cmfeditionsdexteritycompat:

also de-groked
The get_macros_wrapper seems not to be necessary from change in CMFEditions:

plone/Products.CMFEditions@5368062ac1d83d1cb6466b0572b7286b2747ec10
Port merged cmfeditionsdexteritycompat tests *off of* plone.testing:

Can't have a mix of tests and converting these tests to plone.testing
would require converting CMFEditions' tests as well which are probably
widely re-used.
More explicit skin layer ordering
Redundant profile installation causing skin layer order issue