avoid race conditions whit captiveportal when restarting firewall
Merge branch 'jag/stop-captiveportal-on-fw-restart' into 3.2

Conflicts:
	main/captiveportal/ChangeLog
	main/firewall/ChangeLog