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