TRUNK-3926 updated messagecode to make it more readable
Merge pull request #797 from vaibhav-hp/Trunk-3926-new

TRUNK-3926 updated messagecode to make it more readable