User Defined Flows Problem

[Cantor, Scott]

I just checked in a change that combines the flow registries, and it seems
to work, the tests all run and the testbed's still working.

If you can try the CAS flows with that change and see if that solves the
problem, I think we have a solution.

The only reason I didn't do it this way was that I could have sworn
combining flow-location-pattern with flow-location in the same registry
wasn't working for me. It's possible it didn't work before, maybe they
fixed something in 2.4.

-- Scott