Incorporate PECL and rpm changes to reflect 2.2.5
Merge branch 'hotfix/2.2.5-pecl'