Fix mock import in tests.

For some reason, one test imports Mock class from mock.mock
rather than from mock.
This change fixes this error.

Signed-off-by: Oleg Girko <ol@infoserver.lv>

Add options for including state in search results

v2 sync: Get rid of the event_map, and rename the keys of the rooms obj

Remove m.login.token from advertised flows.

Use min and not max to set an upper bound on retry interval

s/private_user_data/account_data/

Take a boolean not a list of lambdas

Split out text for missing config options.

Fix database port script to work with new event_search table

We're keeping 'events', in case we decide to add more keys later.

joined->join
invited->invite
archived->leave

Share sytest clone across runs

Depends on https://github.com/matrix-org/synapse/pull/380

Depends on https://github.com/matrix-org/synapse/pull/380

This allows packages to more easily override the default messages to
include package specific options.