Merge pull request #139 from iuj/master

Fixing ESBJAVA-3327.
Fixing ESBJAVA-3327.
ESBJAVA-3312
Merge pull request #140 from vanjikumaran/master

ESBJAVA-3312
Remove the unnecessary terminate
Adding config parameters to synapse.properties
Merge remote-tracking branch 'upstream/master'