
Per patches from @SteVwonder and @garlick Signed-off-by: Ralph Castain <rhc@pmix.org> (cherry picked from commit d4070d5f58f0c65aef89eea5910b202b8402e48b)
Per patches from @SteVwonder and @garlick Signed-off-by: Ralph Castain <rhc@pmix.org> (cherry picked from commit d4070d5f58f0c65aef89eea5910b202b8402e48b)