Merge pull request #2294 from anilgooru/release-6.6.3.a1

Moved static text to message.properties file.
Moved static text to message.properties file.
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1: