Shmem fixes (Don't merge until #1041 is merged)

[karasevb]

Cherry-picked from open-mpi/ompi#1867 and #1041
Don't merge until #1041 is merged.

[mellanox-github]

Test FAILed.
See http://bgate.mellanox.com/jenkins/job/gh-ompi-release-pr/2104/ for details.

[jladd-mlnx]

@artpol84 Please have a look.

[artpol84]

bot:milestone:v2.1.0

[artpol84]

bot:label:WIP-DNM

[jsquyres]

bot:mellanox:retest

[mellanox-github]

Test FAILed.
See http://bgate.mellanox.com/jenkins/job/gh-ompi-release-pr/2129/ for details.

[artpol84]

@jsquyres this PR is ok, but the base PR is failing.

[jsquyres]

@artpol84 Ah, you mean this one won't pass CI until #1041 is merged?

[artpol84]

@jsquyres right!

[artpol84]

At least I hope so - we'll see once #1041 will be merged and this commit will get a chance to be verified.

[jsquyres]

bot:mellanox:retest

[mellanox-github]

Test FAILed.
See http://bgate.mellanox.com/jenkins/job/gh-ompi-release-pr/2169/ for details.

[jsquyres]

@karasevb @artpol84 Getting a compile failure in in SPML UCX.

[artpol84]

@jsquyres this is expected:

we depend on #1041 which in turn depends on #913. Won't get compiled untill those 2 are in.

[jsquyres]

@artpol84 Ok

[jsquyres]

The ompi-release repo is now closed; all release branches have been moved to the ompi repo (https://github.com/open-mpi/ompi). Please re-open this PR on the corresponding branch on the ompi repo.

[artpol84]

ported to ompi (open-mpi/ompi#2127).
Please close this one to avoid confusion.