PYTHON-175 - Use control connection timeout in wait_for_schema_agreement

Contains tweaks to #191, and adjustment of one test.