[FIX] override copy method to avoid duplicate child ids
[MERGE] merge with main branch
[MRG] merge with main branch
[FIX] Don't reset an existing but empty mail.catchall.domain
[MRG] merge with main barnch
[FIX] convert: gracefully ignore missing XML IDs when processing <delete> tags + warn in log
[MERGE] mail: avoid resetting purposefully empty catchall domain setting, courtesy of Stefan Rijnhart (Therp)
[FIX] mail: change copy call to copy_data to avoid resending email during duplication (opw 607295)
[MERGE] [FIX] hr: when duplicating an employee or user, do not duplicate the reference to other employees (opw 607313)
Merge branch 'openobject-server/7.0' into demo/7.0
Merge branch 'openobject-addons/7.0' into demo/7.0