Content views: fixing api doc and perms in several places
Merge pull request #1830 from daviddavis/filters-api-doc

Content views: Fixing api doc in a few places
Merge remote-tracking branch 'upstream/master' into fork-content-filters_merge
Merge pull request #1841 from bbuckingham/fork-content-filters_merge

merge master in to content-filters
Content views: fix filter add_product error