Minor changes per Jeff's request on PR for 1.8.4

opal/mca/hwloc/base/hwloc_base_util.c

@@ -68,7 +68,7 @@ hwloc_obj_t opal_hwloc_base_get_pu(hwloc_topology_t topo,
        So first we have to see if we can find *any* cores by looking
        for the 0th core.  If we find it, then try to find the Nth
        core.  Otherwise, try to find the Nth PU. */
-    if (NULL == (obj = hwloc_get_obj_by_type(topo, HWLOC_OBJ_CORE, 0))) {
+    if (NULL == hwloc_get_obj_by_type(topo, HWLOC_OBJ_CORE, 0)) {
         obj_type = HWLOC_OBJ_PU;
     }
 

orte/mca/rmaps/rank_file/rmaps_rank_file_component.c

@@ -88,14 +88,14 @@ static int orte_rmaps_rank_file_register(void)
     tmp = mca_base_component_var_register(c, "path",
                                           "Name of the rankfile to be used for mapping processes (relative or absolute path)",
                                           MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
-                                          OPAL_INFO_LVL_9,
+                                          OPAL_INFO_LVL_5,
                                           MCA_BASE_VAR_SCOPE_READONLY, &orte_rankfile);
     (void) mca_base_var_register_synonym(tmp, "orte", "orte", NULL, "rankfile", 0);
 
     mca_rmaps_rank_file_component.physical = false;
     (void) mca_base_component_var_register(c, "physical", "Rankfile contains physical cpu designations",
                                            MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
-                                           OPAL_INFO_LVL_9,
+                                           OPAL_INFO_LVL_5,
                                            MCA_BASE_VAR_SCOPE_READONLY,
                                            &mca_rmaps_rank_file_component.physical);