Update Avocado minimum version in setup.py
2.2.0 Release
2.2.1 Bump
Merge remote-tracking branch 'upstream/2.2' into kev-lazy-choices