Merge ROLLNETWORK make var into ROLLMPI.  For consistency, allow ROLLMPI to
include a version similar to ROLLCOMPILER.
Upgrade papi version.