Fixes headlines in ZendService components
Merge pull request #1207 in master
Merge pull request #1211
Merge pull request #1211 in develop