Ensure proper handling of default MCA param files

Update PMIx/PRRTE to ensure we pickup the default system and user MCA
param definitions during PMIx_server_setup_application so they get
propagated. Protect OPAL's MCA var processing so it doesn't try to
process a NULL filename when PMIx provides the params for it.

Signed-off-by: Ralph Castain <rhc@pmix.org>

opal/mca/base/mca_base_var.c

@@ -297,6 +297,11 @@ int mca_base_var_init(void)
             return OPAL_ERROR;
         }
 
+        if( NULL == (cwd = getcwd(NULL, 0) )) {
+            opal_output(0, "Error: Unable to get the current working directory\n");
+            cwd = strdup(".");
+        }
+
         /* Set this before we register the parameter, below */
 
         mca_base_var_initialized = true;
@@ -410,20 +415,15 @@ int mca_base_var_cache_files(bool rel_path_search)
     char *tmp;
     int ret;
 
-    if (NULL == cwd) {
+    if (NULL != getenv("OPAL_USER_PARAMS_GIVEN")) {
-        cwd = (char *) malloc(sizeof(char) * MAXPATHLEN);
+        /* PMIx already provided the params for us */
-        if( NULL == (cwd = getcwd(cwd, MAXPATHLEN) )) {
+        return OPAL_SUCCESS;
-            opal_output(0, "Error: Unable to get the current working directory\n");
-            cwd = strdup(".");
-        }
     }
 
 #if OPAL_WANT_HOME_CONFIG_FILES
-    if (NULL == getenv("OPAL_USER_PARAMS_GIVEN")) {
     opal_asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
              "mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
              home, ',', opal_install_dirs.sysconfdir);
-    }
 #else
     opal_asprintf(&mca_base_var_files, "%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
              opal_install_dirs.sysconfdir);

opal/mca/pmix/pmix4x/openpmix

@@ -1 +1 @@
-Subproject commit 8de5cade7be10b054c0a1e53fba20d207333a279
+Subproject commit d5619eed03c844195ab9e34e7ece6c4f1d6c4596

prrte

@@ -1 +1 @@
-Subproject commit cf8f7e61e2a084c9bc9df4fb25bb4933ccf02857
+Subproject commit e1959aec4079e74c142a6d6ff1854fde33fef5c9