Merge pull request #122 from malakasilva/master

ESBJAVA-3156 fix test case fail. Synapse function stack is not added.
fixing ESBJAVA-3303
Merge pull request #123 from miyuru/master

fixing ESBJAVA-3303