Corrected typo
Merge branch 'jbahillo/activesync' of github.com:Zentyal/zinc into jbahillo/activesync

Conflicts:
	modules/zentyalcloud/manifests/openchange/zpush.pp
Corrected path for templated file