Fixing a bad merge commit in packaging/debian/changelog
Adding an ec2_elb test to re-add an instance that had been removed