Change McSAF merge and copy signature.

Fix callers and implementations.
Fix Tamer+ code to implement new merge and copy

Also use Map instead of HashMapFlowMap in ReachingDefinitions