Revert "Merge branch 'FlexBridgeBeta'"

This reverts commit f90ce59a1b3b474245b9d4f7369c29ceb2212e0c, reversing
changes made to c260ac540e7aff9c22633ffc35d94b81817b2f0e.

I (Chris Hirt) had to revert this because of some complexities I don't understand in NUnit failing after the merge.  I was unable to resolve it in a timely manner so I will look into other way to do this merge without affecting master (and everyone else).