Luke, also please put the patch for src/controlpanel/view/network.py into a CDBS patch in debian/patches, ideally two patches as you're fixing two issues.
Luke, also please put the patch for src/controlpane l/view/ network. py into a CDBS patch in debian/patches, ideally two patches as you're fixing two issues.