Squashed 'Core/CppMicroServices/' changes from 5dc70e7..5c3cb00

5c3cb00 Added more quotes and removed internal variable from config file.
0f663b0 Added missing quotes around include statement

git-subtree-dir: Core/CppMicroServices
git-subtree-split: 5c3cb00129750be34596d0589e6ce3a07319a302