Branch to add tracer advection modifications that are already in newer versions of the trunk. The modifications to be included are, in this order:
branches/2015/nemo_v3_6_STABLE@8102
branches/2015/nemo_v3_6_STABLE@8305
ticket #1877 (bug fixes)
ticket #2004 (bug fixes)