URL Dispatcher

Merge proposals dependent on lp://staging/~charlesk/url-dispatcher/fix-ftbfs-when-build-type-not-set

  1. fix-ftbfs-when-build-type-not-set
  2. Dependent merge proposals

lp://staging/~charlesk/url-dispatcher/fix-ftbfs-when-build-type-not-set has no merge proposals.