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