Decompose mapping Merging into two mappings

Mapping merging does currently perform neighbour merges (touchVertexFirstTime etc.) as well as the merging of the time step data from the master with the worker. Often only a merging of time step data is necessary. The touchVertexFirstTime merges then reduce to a nop. In a shared memory context, this means that we add unnecessary overhead.