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