Upgrading 'allowed builds' to capability/requirements match doesn't work properly

When upgrading from 1.2.x to 2.0 Bamboo reads in the allowed builds for a queue and coverts them into a capability/requirements match.

Currently however if you have a plan specifically assigned to multiple (but not all - not sure what would happen in this case) queues but not others, two sets of requirements are created, one for the first queue and one for the second. This results in an inability for any agent to build the plan because no agent matches BOTH requirements.

See screen shot for an example. In this case the build was assigned to both the Everthing Else Queue and the JIRA Plugins Queue, the resulting requirement should have been ALLOW_ANY_BUILDS|\QEverything Else Queue\E|\QJIRA Plugins Queue\E.

The other issue with this is it violates the restrictions on requirement keys and creates 2 with the same key (which causes other issues).