Code review comment for lp:~jderose/dmedia/peering

I'm gonna self-approve this so we can get this through the daily builds and then I do the remaining work in smaller pieces.

Note that none of this functionality is turned on yet by default, so this is safe to merge to trunk, despite parts of it still being works in progress.