Merge changes I23db5a29,Ide35e395

* changes:
  MH2 | Change rc file to more appropriate settings
  MH2 | Add makeFMQ helpers to HalProxy_test