drop registrations that hit _maxserve, and fix tests to run properly
- the old behaviour was based on an incorrect understanding of the previous iteration of the code
Merge branch 'bug9349_server_endpoints' into bug9349_server_urlparam

Conflicts:
	facilitator/facilitator