AWS: Move PrivateIpAddress to the NetworkInterface structure if it exists

When trying to associate a specific private ip address and a (non-elastic) public ip address, AWS requires the PrivateIpAddress value to be under the NetworkInterface structure.

Similar to the fix for: https://github.com/aws/aws-cli/issues/520