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