NA OFI: Clean up caps/mr mode and restrict to at least v1.5 of OFI
NA OFI: Clean up caps/mr mode and restrict to at least v1.5 of OFI

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury