Merge branch 'bug9349_server_endpoints' into merge-next

Conflicts:
	facilitator/Makefile
	facilitator/fac.py
	facilitator/facilitator
	facilitator/facilitator.cgi