merge some modifications into a new composite#810

Mathieu-Deharbe wants to merge 12 commits into

maingridsuite/network-modification-server:mainfrom

merge-modifications-into-compositegridsuite/network-modification-server:merge-modifications-into-compositeCopy head branch name to clipboard