fix TOOLS-2500
remove layoutmanager from MessageStore
fix TOOLS-2501
fix TOOLS-2502
fix TOOLS-2503
Merge pull request #84 from lsdeva/370

Merging pull req from lali to fix esb editor issues, Thanks lali for the quick fixes