Merge branch 'for_vlad' of ssh://openfabrics.org:1010/home/pschulfer/compat into...