tests(functional): more functional test hardening

These changes seemed to fix the issues with @shane-tomlinson's PR #923 test failures: https://travis-ci.org/mozilla/fxa-content-server/builds/23550404

@pdehaan or [anyone] r?