wip before master merge
Merge branch 'master' into oab-empty

Conflicts:
	main/openchange/stubs/apache-ocsmanager.conf.mas
rmeoved tmp fudge
fixed blank lines
add oab.xml stub
remove the use of internal interfaces for rpcproxy, it is in another branch
typo fix
typo fix
mrevoed fudge deprecated by changes in master
Assure that apache alias mod is loaded
Merge pull request #1587 from Zentyal/jag/oab-empty

Add a empty OAB for openchange