Code review comment for lp:~leonardr/launchpad/multiversion-wadl

This needs another review. Two tests failed when I ran the ec2 suite. Both of them were fallout from when I changed the 'api' vhost's root url from "http://api.launchpad.dev/beta/" to "http://api.launchpad.dev/".

The fix to webapp-publication.txt was trivial. The fix to xx-branchmergeproposal.txt was not. canonical_url() had no idea how to incorporate the version of a web service request, and the test wasn't specifying which version of the web service was desired. I had to make canonical_url work when passed a versioned web service request, and then change the test to create a versioned request and pass it into canonical_url.

ec2 test is running again and will hopefully come up roses in the morning.