Corrected getJabberAdmins to properly provide array of admins uid's
Merge pull request #951 from Zentyal/jbahillo/jabber-admin

Corrected getJabberAdmins to properly provide array of admins uid's
Improving zentyal-ppa-build to detect wrong KEY  for signing
Merge pull request #957 from Zentyal/jjgarcia/fix-zentyal-ppa-build-script32

Improving zentyal-ppa-build to detect wrong KEY  for signing
Merge branch '3.2' into 3.3

Conflicts:
	main/jabber/ChangeLog
Merge branch '3.3'

Conflicts:
	extra/scripts/zentyal-ppa-build.sh