Merge branch '#1336-note-about-zend-servicemanager-over-zend-di'

Close #1336
removed unexpected **
[#1301] Added emphasize-lines directive

- to highlight the line needing bold
Merge branch 'hotfix/1301' into develop

Forward port #1301