Fix TOOL-2517, TOOL-2518
resolving conflict due to message processor gif
merge before commit
Merge branch '370' of https://github.com/lsdeva/developer-studio into 370