BPS-574
Merge pull request #7 from firzhan/master

BPS-574 config file changes
Adding Test Case for CARBON14841
Adding Test Case for CARBON14841
Adding test patches to integration tests.
Merge remote-tracking branch 'upstream/master'