minor refactor of LS code
Merge branch '2.3.x' into cc-4979-add-fourth-switch

Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq