We replicated this issue. The fix @dmbigham suggests works.
As I see it, it seems to be an issue with the sub-tenant crosswalk. The workaround basically abandons the crosswalk functionality and utilized the GRA 1.0 feature of adding a custom branch field. It still seems to use the db table that the crosswalk uses to capture branch names, so there is no additional data entry required to get it set up.
That said, you do have to go in and reassign branches to every user in that custom field. Also, my guess is might mess up reporting somewhere, since the branch stats are probably tied to the crosswalk? Not sure. The branch field in the list results is now blank, obviously.
This isn't a super big emergency, but should be looked at.