ZF-6789: Ec2 Instnace groupSets don't match up when you ignore terminated instances.


Ec2 groupSets should be put with their instances instead of being put in a separate array where they might not match up if you have any terminated instances and you are ignoring the terminated instances.


This was done with r16390 as it was part of the update to the describeInstance method.