Bug 914477 - fix regression of permission manager
Merge pull request #12053 from gasolin/issue-914477

Bug 914477 - fix regression of permission manager, r=alive