Fix *.permission.inc files.
Merge branch 'SCHOLAR-3.x' into 4374
Merge branch '4374' into 4374-behat-test.