For feedburner feeds, use the rel="self" as the authoritative feed_url
Merge branch 'self_as_authority_feed_url'