SAML Brokering Broken in 5.0 SP1?

Is anyone having problems with SAML Brokering in Access Manager 5.0 SP1?  I cannot get any brokering groups to work/apply in this version of NAM.  You can see in the debug logs that it never matches any IdPs or SPs no matter what.  

5.0 SP2 seems to work, but I cannot upgrade to 5.0 SP2 because there is a MAJOR OAUTH bug in 5.0 SP2 which completely breaks one of the common OAUTH flows.

Matt