Reimplement Ec2Snitch now that CASS-5215 is resolved
Also allow for backwards compatibility for Ec2Snitch