Merge branch 'hotfix/860'

Close #860
Merge branch 'develop'

Merging develop to master in preparation for 2.2.0 release.
Master version is 2.2.0dev
Fixed wrong use statements
Merge pull request #861 from venu/fix/zendservice.apple.apns.rst

Fixed wrong use statements
Merge branch 'hotfix/861' into develop

Forward port #861