Sync to r31640
Sync to r31658
Sync to largescale changes in OMPI devel trunk build system largeley determined by upstream pushes from ORCM
Sync to r31679
Sync to r31865
ckpt for merge
Merge branch 'master' of github.com:rhc54/orcm-staging
Complete integration with build system changes