Fixed conflic of merging with new-gm-api

...u/chorevolution/vsb/artifact/generators/WarGenerator.java

binding-components/pom.xml

gmdl-tools/pom.xml

.../vsb/playgrounds/clientserver/rest/RestClientExample.java

protocol-pool/gm-coap/pom.xml

protocol-pool/pom.xml

scenarios-end-to-end-test/pom.xml

...ion/vsb/test/trafficlight/mock/RestLegacyServiceMock.java

vsb-manager-service-bundle/pom.xml

...rc/main/java/eu/chorevolution/vsb/manager/VsbManager.java

...est/java/eu/chorevolution/vsb/manager/VsbManagerTest.java