replace squid3 to squid
Merge branch 'fix/squid-fix-config2' into develop