24448 Update to features 2.2
Merge pull request #218 from previousnext/24448-features-update-1.x

1.x: 25593 Update to features 2.2
Prepare for release
Merge branch '7.x-1.x' into 25596-missing-1.2-upgrade-test
Bring upgrade tests up to date