fixed setting of mail accounts from the edit user main form when mail is enabled
backported fix from master to alias tmeplate
leftover fixes from previous commit, updated changelog and control
remvoed debug
up chlog
check form ail mod is configured instead of only exists
 Fixed jabber-ldap script
Update ChangeLog
Merge branch '3.2' into jag/users-mail-integration-fixes

Conflicts:
	main/mail/ChangeLog
	main/users/ChangeLog
Merge branch '3.2' into jag/users-mail-integration-fixes

Conflicts:
	main/users/ChangeLog
fixed changelogs
Fix parsing of the json when asking for the available server to recover
EBox::RemoteServices::Subscription::Check::check recovers for  any error raised on useers checking
added lost line
Avoid error when trying to show a no longer existent mail in queue
Fixed bug that made impossible to add rules
Merge pull request #1240 from Zentyal/jag/remoteservices-robust-subscription-check

EBox::RemoteServices::Subscription::Check::check recovers for  any error...
Merge pull request #1237 from Zentyal/rduran/fix-installer-dr

Fix parsing of the json when asking for the available server to recover
Merge pull request #1242 from Zentyal/jag/mail-show-mail-in-queue

Avoid error when trying to show a no longer existent mail in queue
Merge pull request #1246 from Zentyal/jag/trafficshaping-add-rule

Fixed bug that made impossible to add rules