Merge branch 'master' into dsuch-t-gh323-add-alembic-http_soap
Wait longer for the test TLS server to start up.
GH #323 - Added a migration for http_soap's rows new in 2.0
Merge branch 'dsuch-t-gh323-add-alembic-http_soap'