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