RF-12736: Notify message escaping - fixing impl and test