Revert "bugfix of processing last NFFG"
Revert "bugfix of processing last NFFG"

This reverts commit 77a1fd09f1b9953ea65eb735ffdd4a0818f64dc7.
Message "Resolve big conflict from merging development and master UNTESTED"
The merge was not correct, because changes of master are not incorporated.

5GExchange/mapping,5GExchange/mapping