Merge "Made MessageCache::replace() ignore messages with content language suffix"