Fixes #4749: Move r32096 to v1.8 branch (If the enable fails don't)

Based on custom patch from Nathan

---svn-pre-commit-ignore-below---

r32096 [[BR]]
If the enable fails don't give up, but instead keep going with
the other collective modules. If we endup without some of the
collective the code will raise an error anyway.

cmr=v1.8.2:reviewer=hjelmn
Fixes #4779: Move r32183 to v1.8 branch (Subject:  fix name conflict)

---svn-pre-commit-ignore-below---

r32183 [[BR]]
Subject:  fix name conflict when both ugni and scif installed on system
Description: This mod fixes two name conflicts between the ugni and scif btls.
References:4771
Closes:4771

cmr=v1.8.2:reviewer=hjelmn
GK fix: add missing help-mpi-coll-ml.txt file