Rename/fix EC2 bundle filtering test so it runs with junit target.
Instance restore and private IP clean up for EDGE mode - EUCA-8499

Edge mode now supports restoration of network resources for instances.
Release of private IP addresses now waits for the network resource
callback before releasing pending addresses.

EUCA-8499
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8606' into testing