Combine allowed blocks

Problem/Motivation

If a user has multiple roles and a block is not allowed in the first checked role, but it is in the second role, then the user can not use the block.

I'd rather have it work like drupal permissions where whate the users sees is a combination of all allowed roles.

Steps to reproduce

Create a user with 2 roles, allow a few blocks in role 1 and a few other in role 2. The user will only have access to the first or second set, not both.

Proposed resolution

Patch attached, but it's not fully done yet. This will also break backwards compatiblity.

Remaining tasks

Make the behaviour a setting?