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

Moved Messages to Message properties file.
Moved Messages 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: