Merge remote-tracking branch 'gitlab/testing' into testing
Merge remote-tracking branch 'upstream/testing' into testing
Added a new test for ELB with SSL. Added a few new elbops that resulted in refactoring ssl_server_certs_basics test. Also, changed asops wait_for_instances to not need to be passed a tester object.
Minor tweak, remove ELB port 80 listener after adding HTTPS port 443 listener in ELB SSL termination test
Merge pull request #244 from tbeckham/testing

ELB SSL termination test