Provide unit test coverage for AWS::EC2::SecurityGroup

There were some issues that testing revealed, includes fixes
for those.

Fixes bug 1129577

Change-Id: I31b02c7fc9179b61b74dd18a38e15d126b406f80
Merge "Provide unit test coverage for AWS::EC2::SecurityGroup"