Verbal CMR on the authority of both Ralph and Brian on the phone this
afternoon.  Bring over r27894 (adapted for v1.7) and r27886 from
trunk.

---svn-pre-commit-ignore-below---

r27894 [[BR]]
Fix an old bug: the project name in these variables should be upper
case.

Fixing this issue allows the following case to start working again:

./configure --disable-dlopen --with-hwloc=/path/to/some/external/hwloc ...

Without this fix, the wrapper compilers would include -lhwloc, but
would not include -L/path/..., so -lhwloc would not be found.

r27886 [[BR]]
OPAL_WRAPPER_EXTRA_CPPFLAGS is the wrong variable, want to set
WRAPPER_EXTRA_CPPFLAGS