documentation updates, include upgrade notes for users upgrading from 2.2
Merge branch 'master' into ganta