Merge pull request #7368 from stangri/master-luci-app-pbr