Merge branch 'release-7.x-2.2-rc17'
Version bumped from 7.x-2.2-rc17 to 7.x-2.2-rc18
Merge branch 'release-7.x-2.2-rc18'