Udpate fcoll and clean up fbtl.
Merge branch 'merge' of https://github.com/hjelmn/ompi-mca-var into merge