Merge "Fix pep8 failures in test_ec2_security_groups.py"