ESBJAVA-3322
Merge pull request #60 from vanjikumaran/master

ESBJAVA-3322