Merge proposals dependent on lp://qastaging/~raharper/curtin/trunk.vmtest_add_huge_disk_tests

1. trunk.vmtest_add_huge_disk_tests
2. Dependent merge proposals