Merge pull request #1787 from clebertsuconic/2.4.x

Simplifying Message.toString() on Properties
maximizing string size on Properties