fix trolling abstract factories
Merge pull request #5237 from turrsis/hotfix/serviceManager-trollAbstractFactories(4285)

ServiceManager - fix AbstractFactories performance and service waiting
[#5237] Consistency fix

- Return from conditional
- Promote else
Merge branch 'feature/5237' into develop

Close #5237