Fixes to build-mpirun-configfile.py