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

Conflicts:
	main/openchange/stubs/apache-ocsmanager.conf.mas
RPC proxy is avaialble in web interface when you have only internal interfaces
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
Better warning in change hostname confirmation dialog. Confirmation dialog action recovers correctly from errors
Add hostname change confirmation dialog to wizard
tentative fix for duplicate certificate problem with 3.5 to 4.0 upgrade
Merge pull request #1587 from Zentyal/jag/oab-empty

Add a empty OAB for openchange
Merge pull request #1584 from Zentyal/jag/openchange-rpcp-internal-ifaces

RPC proxy is avaialble in web interface when you have only internal inte...
Merge pull request #1590 from Zentyal/jag/change-certificate-warn

Jag/change certificate warn
Merge branch 'master' into jacalvo/ca-defaults

Conflicts:
	main/core/ChangeLog
	main/openchange/ChangeLog