WL-3191 Use new interface in permissions helper

The permissions helper now accepts multiple sources of role information.

For a given folder there will be roles coming from the site but there may
also be roles defined on the content itself too. Let's have them both.