trunk-3987NEW(1.8.x)

I have modified the changes .
changes to Trunk-3978NEW(1.8.x)
after doing mvn clean install
Merge pull request #572 from suraj5/Trunk-3987NEW(1.8.x)

trunk-3987NEW(1.8.x)