https://issues.apache.org/jira/browse/AMQ-5033 - revert changes to the rss and atom feed links, as c:url doesn't escape value
https://issues.apache.org/jira/browse/AMQ-5480

Give the user more rope.
Merge remote-tracking branch 'upstream/trunk' into trunk