Fixes for Issue, Id : TOOLS-2528

This fix includes adding a new Java class, changes in existing Java
class, and plugin.xml file changes