Revert "Merge overlapping security group ranges"

This reverts commit 3e80a41317e2a7e0b957bb7bd3135eef4ad51287.
Overlapping port ranges should create multiple security group rules.  Update tests to validate this.