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