Fix ec2 security groups with source groups

Change-Id: I676719dfcb89224a25d448ac3b375b96df436c19
Fixed up some tests due to backports

Change-Id: I93c6dbfaf49b26b7b149531f6e9c94064b8206a6