Improve hot-standy test (less sleeps).
Default port is 3301 (prime).
Merge branch 'ocelot-master'

Conflicts:
	doc/user/configuration-reference.xml
	doc/user/connectors.xml
	doc/user/databases.xml
	doc/user/server-administration.xml
Correct ports (admin = 3313, listen = 3301)