Upgrade versions.
Resolves APS-17.
Merge branch 'master' of https://forge.sdsc.edu/stash/scm/aps/mpi-roll

Conflicts:
	src/mvapich2/version.mk
	src/openmpi/version.mk
	src/roll-test/version.mk