Merge branch 'candidate-5.4.0'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

esp/src/eclwatch/templates/QuerySetQueryWidget.html

@@ -17,6 +17,7 @@
                     <div id="${id}Filter" data-dojo-type="FilterDropDownWidget">
                         <input id="${id}QueryID" title="${i18n.ID}:" name="QueryID" colspan="2" data-dojo-props="trim: true, placeHolder: '${i18n.QueryIDPlaceholder}'" data-dojo-type="dijit.form.TextBox" />
                         <input id="${id}QueryName" title="${i18n.Name}:" name="QueryName" colspan="2" data-dojo-props="trim: true, placeHolder: '${i18n.QueryNamePlaceholder}'" data-dojo-type="dijit.form.TextBox" />
+                        <input id="${id}PublishedBy" title="${i18n.PublishedBy}:" name="PublishedBy" colspan="2" data-dojo-props="trim: true, placeHolder: '${i18n.PublishedBy}'" data-dojo-type="dijit.form.TextBox" />
                         <input id="${id}Wuid" title="${i18n.WUID}:" name="WUID" colspan="2" data-dojo-props="trim: true, placeHolder:'W20130222-171723'" data-dojo-type="dijit.form.TextBox" />
                         <input id="${id}ClusterTargetSelect" title="${i18n.Cluster}:" name="QuerySetName" colspan="2" data-dojo-type="TargetSelectWidget" />
                         <input id="${id}FileName" title="${i18n.LogicalFile}:" name="FileName" colspan="2" data-dojo-props="trim: true, placeHolder: '${i18n.TargetNamePlaceholder}'" data-dojo-type="dijit.form.TextBox" />

rtl/eclrtl/eclrtl.cpp

@@ -314,8 +314,12 @@ CriticalSection ucmCrit;
 static void clearUnicodeConverterMap()
 {
     delete unicodeConverterMap;
+    unicodeConverterMap = NULL;  // Important to clear, as this is called when threadpool threads end...
     if (prevThreadTerminator)
+    {
         (*prevThreadTerminator)();
+        prevThreadTerminator = NULL;
+    }
 }
 
 RTLUnicodeConverter * queryRTLUnicodeConverter(char const * codepage)