This commit was SVN r23459.
remove unneeded temp variable. This commit was SVN r23424.
openib BTL changes coming soon. This commit was SVN r23385.