rev 12244

Don't merge {{distinguish}} templates if using text= parameter

In rev 12259, General fixes still incorrectly combines {{distinguish}} when the templates contain the "text" parameter - (e.g. [[WTVW]])

rev 12331 further fix