Merge branch 'merge-next' into merge-all

Conflicts:
	facilitator/Makefile
	facilitator/facilitator-test.py
	facilitator/init.d/facilitator.in
	flashproxy-reg-email
	flashproxy-reg-http
	flashproxy-reg-url