AUTO-636-changes to make tests create servers with private ips (ready for review)