Merge ConfigService Update + Fujitsu
Merge pull request #216 from jmpascal/MERGING-1

Merge ConfigService Update + Fujitsu merge