Disallowing branched feeds from feed search.
Migrating comment feeds to non-comment feeds.
Merge branch 'master' into ruserstory

* master:
  Migrating comment feeds to non-comment feeds.
  Disallowing branched feeds from feed search.