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

Conflicts:
	main/openchange/stubs/apache-ocsmanager.conf.mas
fixed bad mason argmunents
Fixed problem with refreshSubscriptionInfo for unsubscribed and community servers.  remove unused initialSetup
typo fix
remove deprecated commertial messages
using file::magic to get mime type
Merge branch 'master' into new-remote-services-fixes
RPC proxy is avaialble in web interface when you have only internal interfaces
The informational tooltip refers to Upgrade button while it's Update one.
Merge pull request #1585 from Zentyal/jkerihuel/update-typo

The informational tooltip refers to Upgrade button while it's Update one...
fix setting of QA repo
workaround for the inclusion of apt-transport-https on the base system
fixed typo
add apt-transport-https dependency to zenbuntu-core
remove deprecated reference to remoteservices
Merge branch 'master' into jag/new-remote-services-fixes
rmeoved tmp fudge
fixed blank lines
add oab.xml stub