This fixes the oshmem build bug identified by Orion Poplawski where shmem

wrapper-data incorrectly adds @OMPI_WRAPPER_EXTRA_LIBS@. This fixes trac:4796 and should be
added to: 

cmr=v1.8.2:reviewer=jsquyres

This commit was SVN r32299.

The following Trac tickets were found above:
  Ticket 4796 --> https://svn.open-mpi.org/trac/ompi/ticket/4796

oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in

@@ -29,7 +29,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 # intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
-libs=-loshmem -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-loshmem -lmpi
 libs_static=-loshmem -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=libsohmem.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=liboshmem.a

oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in

@@ -28,7 +28,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 # intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
 # etc. are pulled in implicitly) because we intend MPI applications to
 # only use the SHMEM and MPI APIs.
-libs=-loshmem -lmpi_mpifh -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
+libs=-loshmem -lmpi_mpifh -lmpi
 libs_static=-loshmem -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=liboshmem.a