Fix oustide activity

[Nitnelav]

There is an error when running a scenario cutter on top of a previous scenario cutter, the outside activity ids start from 1 again without checking the existence of previous ids in the scenario.
This patch fixes it

[Nitnelav]

I don't know why I keep having the AnalysisOutputListener part in my commits... did I really add that last year without commiting it ?

[sebhoerl]

Don't know, often when I do "partial contributions" from a branch that has already been merged partly in the past, I do something like that:

• checkout target master (here develop) branch, pull latest version
• checkout my_branch, make sure everything is clean
• merge in master branch, resolve conflicts, to be sure the branches are compatible
• then do git reset master which will only show all the files that have been changed wrt the current master
• then I just pick the files that i want to commit now (and maybe others later) and the reset I just do git checkout master /file/that/i/dont/want/tocommityet
• then I make a git branch new_branch, checkout new_branch and then make a commit which will solely contain the new files without any of my internal history, just mapping the new changes on top of the base master
• then I send a PR from this new_branch

I have the feeling this is what some rebase cherrypicking may do automatically, but it works for me and makes sense for me step by step :D

[Nitnelav]

thanks I think I figured it out !