Un-break HybridPressureFactory for the "p = ap + b * ps" case.

There are now no new test failures on this branch.