Issue ZF-3347: Allow Parent ServiceManager create service with the same name as in  child ServiceManager
Merge branch 'ZF-3347' of git://github.com/Deserved/zf2 into hotfix/3424
[#3424] CS fixes

- Trailing whitespace
- whitespace following operators
Merge branch 'hotfix/3424'

Close #3424
Fixes #3347