Merge pull request #760 from Zentyal/jag/openchange-autodiscover

Added autodiscovery to openchange
Conflicts:
	main/core/ChangeLog
	main/openchange/ChangeLog
	main/openchange/src/EBox/OpenChange.pm
Merge pull request #1280 from Zentyal/jacalvo/3.2-autodiscovery

Merge pull request #760 from Zentyal/jag/openchange-autodiscover