Unify AWS and OS security group references