OSHMEM: sshmem mmap: removed unused help topics
Update the opal_environ code so it behaves correct with the environ if setenv is not available
Fix stupid typo
btl/openib: send openib modex with the PMIX_GLOBAL flag
Don't release the provided opal_proc in the error path.
Merge branch 'master' of github.com:open-mpi/ompi
Merge remote-tracking branch 'upstream/master'