Apply template remove sometimes values that are not in the template

Hello, apply template remove sometimes values that are not in the template.

Exemple, my template removed my personalTab.

Cheers

(from redmine: issue id 5357, created on 2017-01-25, closed on 2017-02-13)

• Changesets:
  • Revision 6c877f27 by Côme Chilliet on 2017-01-25T12:27:02.000Z:

Fixes #5357 Do not remove tabs when applying templates to existing objects

• Revision d07ca592 by Côme Chilliet on 2017-01-25T12:56:26.000Z:

Fixes #5357 Do not remove tabs when applying templates to existing objects

Conflicts:
	include/simpleplugin/class_simplePlugin.inc

• Revision 466f391f by Côme Chilliet on 2017-01-26T09:05:41.000Z:

Fixes #5357 Do not empty groups when applying posix tab template

• Revision 019c70b9 by Côme Chilliet on 2017-01-26T09:07:51.000Z:

Fixes #5357 Do not empty groups when applying roles and groups tab template

• Revision 606d6cb2 by Côme Chilliet on 2017-01-26T12:56:56.000Z:

Fixes #5357 Do not empty groups when applying posix tab template

• Revision ca5bf632 by Côme Chilliet on 2017-01-26T12:57:06.000Z:

Fixes #5357 Do not empty groups when applying roles and groups tab template

• Revision 2215c549 by Côme Chilliet on 2017-01-26T13:10:44.000Z:

Fixes #5357 Avoid merging objectClasses count as an objectClass

• Revision 0e2732d6 by Côme Chilliet on 2017-01-26T13:15:36.000Z:

Fixes #5357 Restore correct is_account value after simplePlugin resets it in adapt_from_template

• Revision 6dec2eab by Côme Chilliet on 2017-01-26T13:50:17.000Z:

Fixes #5357 Avoid merging objectClasses count as an objectClass

• Revision 1c5cfc81 by Côme Chilliet on 2017-01-26T13:50:31.000Z:

Fixes #5357 Restore correct is_account value after simplePlugin resets it in adapt_from_template

• Revision 31c4be85 by Côme Chilliet on 2017-02-07T15:03:28.000Z:

Fixes #5357 Moved mergeObjectClasses in plugin for 1.0.19