update mps patch to match code that is in RELENG_8
Add a back-port of the mps driver to give it more air miles