Merge proposals dependent on lp:~markwash/network-service/test-cleanup

lp:~markwash/network-service/test-cleanup has no merge proposals.