Merge branch 'jbahillo/squid-keytab-perm'

Conflicts:
	main/squid/ChangeLog