Tech support just showed me something that I wasn't aware had changed. I'm not sure if this was available in 9.0, or if it it was added in 9.1, but when defining ACLs in the Org level the Roles tab shows Context Team roles. Which in the past it only showed two roles but they weren't context roles.
Just found this interesting and now possible to start defining my ACLs at the Org level instead of the Product/Library level.