[ofiwg] Pull request 2501: Ofi bgq provider merge before sc16

[Hefty, Sean]

> You can just rebase your local copy with the HEAD of master, and fix
> the conflict in the process.  Then you can force-push back up to your
> branch on github (this is just about the *only* socially-acceptable
> case of force pushing!).  The PR will automatically update with the new
> state of the branch.

I prefer this over opening a new PR, as it keeps the comments from the previous submission.

Thanks,
- Sean