Merge branch 'master' into master-enterprise

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --cc .gitmodules
index 39379e615498f676e1473f7554aa95403ddee988,781a05fb9bc19dd2723c74eedc1c036f49517d84..b0c12bc9a3cb0ec1a94c598ce7b0d48abe68e06f
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -4,5 -4,5 +4,5 @@@
        branch = master
  [submodule "src/assets/configs-scp"]
        path = src/assets/configs-scp
 -      url = ../../sap-labs-france/ev-scp-config.git
 +      url = ../../E-Mobility/ev-scp-config.git
-        branch = master
+        branch = master-qa