Merge branch 'jbahillo/squid-keytab-perm'

Conflicts:
	main/squid/ChangeLog
Time ACLs had a independent id. Dont repeat ACL declaration
typo error
Fixing typo reported in #348
Merge pull request #349 from Zentyal/jjgarcia/typo-fixed

Fixing typo reported in #348
Merge branch 'jag/3.0-squid-timeoverlap-acl-fixes' into 3.0

Conflicts:
	main/squid/ChangeLog
Fix hostname change when having Samba installed.
fixed indentation
Merge pull request #351 from Zentyal/jsalamero/fix-hostname-change-samba

Fix hostname change when having Samba installed.
Merge branch '3.0'

Conflicts:
	main/samba/ChangeLog
	main/squid/ChangeLog