disabling http inbound test
resolve conflict
change datasource properties
conflict relove in datasource.proprties
Merge pull request #119 from isururanawaka/integrationtest

Integrationtest