Frodo requirements:
python version 2.1.0
increment plugin major version
Merge branch 'frodo'
Provisional release notes.
Fix broken tests.