Use separate apache log files for ocsmanager
Fix subscribe CGI after latest changes
Merge pull request #1605 from Zentyal/ejhernandez/fix-rs-after-prod

Fix subscribe CGI after latest changes
Merge branch 'jag/apache-ocsmanager-log'

Conflicts:
	main/openchange/ChangeLog
Merge branch 'master' into scabrero/oc-vdomains

Conflicts:
	main/openchange/ChangeLog
	main/openchange/stubs/apache-ocsmanager.conf.mas