Squashed 'Core/CppMicroServices/' changes from fbb9ebd..2e1f580

2e1f580 Fixed one more gcc MacOS namespace issue.

git-subtree-dir: Core/CppMicroServices
git-subtree-split: 2e1f580ce6edbd20ff6e24cf7f89a6d4856f70a4
Merge commit '6b21be9745525e9fbef514a22ce7752873b01742' into bug-18253-cppmicroservices-update
COMP: Merge branch 'bug-18253-cppmicroservices-update'