allowing address to use network_interface_id
fixing tests
allow private IP be specified when associating with ENI
Merge pull request #2505 from CashStar/eip_eni_associate

allowing address to use network_interface_id. Fixes #2505.