Merge "Add a simple test for port security vs security group"