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