remove manual patch for mercury/ofi/psm2

- this change is in origin/master now

tests/perf-regression/bebop/mercury-psm2-mr-basic.patch

-diff --git a/src/na/na_ofi.c b/src/na/na_ofi.c
-index 152e034..f990fc0 100644
---- a/src/na/na_ofi.c
-+++ b/src/na/na_ofi.c
-@@ -866,7 +866,7 @@ na_ofi_getinfo(const char *prov_name, struct fi_info **providers)
-             hints->caps |= (FI_SOURCE | FI_SOURCE_ERR);
- 
-             /* PSM2 provider requires FI_MR_BASIC bit to be set for now */
--            hints->domain_attr->mr_mode |= FI_MR_BASIC;
-+            hints->domain_attr->mr_mode = FI_MR_BASIC;
-         }
-         else if (!strcmp(prov_name, NA_OFI_PROV_VERBS_NAME)) {
-             hints->rx_attr->mode |= FI_CONTEXT;

tests/perf-regression/bebop/run-regression.sh

@@ -28,10 +28,6 @@ mkdir $JOBDIR
 cp margo-p2p-latency.sbatch $JOBDIR
 cp margo-p2p-latency-knl.sbatch $JOBDIR
 
-# TODO: this is temporary, the real fix is in topic_ofi branch and will
-#  be merged at some point
-cp mercury-psm2-mr-basic.patch $SANDBOX
-
 cd $SANDBOX
 git clone http://git.mpich.org/openpa.git/
 git clone https://github.com/01org/opa-psm2.git
@@ -102,9 +98,6 @@ make install
 echo "=== BUILDING MERCURY ==="
 cd $SANDBOX/mercury
 git submodule update --init
-# TODO: this is temporary, the real fix is in topic_ofi branch and will
-#  be merged at some point
-patch -p1 < $SANDBOX/mercury-psm2-mr-basic.patch
 mkdir build
 cd build
 cmake -DNA_USE_OFI:BOOL=ON -DMERCURY_USE_BOOST_PP:BOOL=ON -DCMAKE_INSTALL_PREFIX=/$PREFIX -DBUILD_SHARED_LIBS:BOOL=ON -DMERCURY_USE_SELF_FORWARD:BOOL=ON -DNA_USE_SM:BOOL=ON ../