Forward port zendframework/zf2#3826
Forward port zendframework/zf2#3826

weierophinney/zend-servicemanager,akrabat/zend-servicemanager,matwright/zend-servicemanager,prolic/zend-servicemanager,MadCat34/zend-servicemanager