Move PrivateIpAddress to the NetworkInterface structure

Only if it exists (in order to associate a public ip).
Merge pull request #2909 from betawaffle/move-private-ip-to-network-interface

AWS: Move PrivateIpAddress to the NetworkInterface structure if it exists