Merge proposals dependent on lp:~pwlars/ue-qa-kernel-tests-infrastructure/fix-10.97-ip-addresses

1. fix-10.97-ip-addresses
2. Dependent merge proposals