Backport Fake IF Picker to reduce diff sizes
Merge pull request #340 from peternewman/trivial-fixes

E1.37-2 Network configuration Redux - Part 4 Take 2b (FakeInterfacePicker)