Added message keys for GCP-5802 and 5808
Added support for parameterized messaging