Fixed regression in LDAP info page for external AD mode
Merge pull request #886 from Zentyal/jag/users-ldapinfo-externalad

Fixed regression in LDAP info page for external AD mode
Show complex types (more than one field) in audit log

While editing by storing the dump of the value

Conflicts:
	main/core/ChangeLog
Take into account view customizer on audit logging

(cherry picked from commit 9552bea4d112c361e6ee5f83ee6f4d7be4656b70)
Use JSON::XS instead of Data::Dumper

Faster and as compact as Dumper

(cherry picked from commit 63220f0f01649aaf79f9ff257abbebbd2e9f885d)
fixed style
Merge pull request #888 from Zentyal/ejhernandez/fix-audit-compose-types-32

Ejhernandez/fix audit compose types 32
Use sharedscripts in zentyal-core logrotate conf file

To avoid triggering in every log file (1 time vs. 6 times)

(cherry picked from commit 87da756f866acd42ffee16e7905436af1f765a7b)

Conflicts:
	main/core/ChangeLog
Merge branch '3.2' into 3.3

Conflicts:
	main/core/ChangeLog
	main/core/src/EBox/CGI/Controller/DataTable.pm
	main/users/ChangeLog
Merge branch '3.3'

Conflicts:
	main/users/ChangeLog