Two cleanups required for transfer to 1.8.4:

* Use %d format for the topo signature as some systems apparently have problems with %u
* Use correct variable in show_help message

opal/mca/hwloc/base/hwloc_base_util.c

@@ -2080,7 +2080,7 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
 
 char* opal_hwloc_base_get_topo_signature(hwloc_topology_t topo)
 {
-    unsigned int nnuma, nsocket, nl3, nl2, nl1, ncore, nhwt;
+    int nnuma, nsocket, nl3, nl2, nl1, ncore, nhwt;
     char *sig=NULL, *arch=NULL;
     hwloc_obj_t obj;
     unsigned i;
@@ -2103,10 +2103,10 @@ char* opal_hwloc_base_get_topo_signature(hwloc_topology_t topo)
     }
 
     if (NULL == arch) {
-        asprintf(&sig, "%uN:%uS:%uL3:%uL2:%uL1:%uC:%uH",
+        asprintf(&sig, "%dN:%dS:%dL3:%dL2:%dL1:%dC:%dH",
                  nnuma, nsocket, nl3, nl2, nl1, ncore, nhwt);
     } else {
-        asprintf(&sig, "%uN:%uS:%uL3:%uL2:%uL1:%uC:%uH:%s",
+        asprintf(&sig, "%dN:%dS:%dL3:%dL2:%dL1:%dC:%dH:%s",
                  nnuma, nsocket, nl3, nl2, nl1, ncore, nhwt, arch);
     }
     return sig;

orte/mca/rmaps/seq/rmaps_seq.c

@@ -334,7 +334,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
                 /* wasn't found - that is an error */
                 orte_show_help("help-orte-rmaps-seq.txt",
                                "orte-rmaps-seq:resource-not-found",
-                               true, nd->name);
+                               true, sq->hostname);
                 rc = ORTE_ERR_SILENT;
                 goto error;
             }