Merge "[master] new version of WebGUI added"
diff --git a/demo/Deploy/deployAndRunBattleship.py b/demo/Deploy/deployAndRunBattleship.py
index 958750d..3cb7b4e 100644
--- a/demo/Deploy/deployAndRunBattleship.py
+++ b/demo/Deploy/deployAndRunBattleship.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import sys, os
 
diff --git a/demo/Deploy/deployBattleship.py b/demo/Deploy/deployBattleship.py
index b545d71..b33543a 100644
--- a/demo/Deploy/deployBattleship.py
+++ b/demo/Deploy/deployBattleship.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import sys, json, os
 
diff --git a/demo/Microservices/BattleShip/BattleShip.py b/demo/Microservices/BattleShip/BattleShip.py
index 46a2814..611ed37 100644
--- a/demo/Microservices/BattleShip/BattleShip.py
+++ b/demo/Microservices/BattleShip/BattleShip.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import random, json, os, time
 from Common.DsRestAPI import DsRestAPI
diff --git a/demo/Microservices/BattleShip/__init__.py b/demo/Microservices/BattleShip/__init__.py
index 175b58b..23d9a40 100644
--- a/demo/Microservices/BattleShip/__init__.py
+++ b/demo/Microservices/BattleShip/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 A small BattleShip game for testing purposes and a little fun.
diff --git a/demo/Microservices/GuiConfigHandlerForBattleship/GuiConfigHandler.py b/demo/Microservices/GuiConfigHandlerForBattleship/GuiConfigHandler.py
index 0bef350..6836b6e 100644
--- a/demo/Microservices/GuiConfigHandlerForBattleship/GuiConfigHandler.py
+++ b/demo/Microservices/GuiConfigHandlerForBattleship/GuiConfigHandler.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import os, json, traceback, sys
 from Common.BaseGuiConfigHandler import BaseGuiConfigHandler
diff --git a/demo/Microservices/GuiConfigHandlerForBattleship/__init__.py b/demo/Microservices/GuiConfigHandlerForBattleship/__init__.py
index 4a898f0..ff6b914 100644
--- a/demo/Microservices/GuiConfigHandlerForBattleship/__init__.py
+++ b/demo/Microservices/GuiConfigHandlerForBattleship/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 This application handles the available WebApplications for the usergroups.
diff --git a/demo/Microservices/__init__.py b/demo/Microservices/__init__.py
index c20f3a5..3e32020 100644
--- a/demo/Microservices/__init__.py
+++ b/demo/Microservices/__init__.py
@@ -1,5 +1,5 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/AppAgent.py b/src/AppAgent.py
index 41e3924..fc37ea9 100644
--- a/src/AppAgent.py
+++ b/src/AppAgent.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 #!/usr/bin/python
 
diff --git a/src/Common/BaseGuiConfigHandler.py b/src/Common/BaseGuiConfigHandler.py
index 97008f7..4d6387b 100644
--- a/src/Common/BaseGuiConfigHandler.py
+++ b/src/Common/BaseGuiConfigHandler.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import json
 from Common.EditableGroupRights import EditableGroupRights
diff --git a/src/Common/DsRestAPI.py b/src/Common/DsRestAPI.py
index 07996b3..dfbe9bb 100644
--- a/src/Common/DsRestAPI.py
+++ b/src/Common/DsRestAPI.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''The module containing the implementation of DsRestAPI'''
 
diff --git a/src/Common/EditableGroupRights.py b/src/Common/EditableGroupRights.py
index 8f63203..8bc2873 100644
--- a/src/Common/EditableGroupRights.py
+++ b/src/Common/EditableGroupRights.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import os, json
 try:
diff --git a/src/Common/__init__.py b/src/Common/__init__.py
index 689fa71..1cf0261 100644
--- a/src/Common/__init__.py
+++ b/src/Common/__init__.py
@@ -1,6 +1,6 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''This package contains common functionality for AppAgent and the handlers.'''
\ No newline at end of file
diff --git a/src/Microservices/Authentication/AuthenticationHandler.py b/src/Microservices/Authentication/AuthenticationHandler.py
index eaa9f96..85d06a3 100644
--- a/src/Microservices/Authentication/AuthenticationHandler.py
+++ b/src/Microservices/Authentication/AuthenticationHandler.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import json, uuid, logging
 from Common.DsRestAPI import DsRestAPI
diff --git a/src/Microservices/Authentication/FileUserHandler.py b/src/Microservices/Authentication/FileUserHandler.py
index 038272e..c34c836 100644
--- a/src/Microservices/Authentication/FileUserHandler.py
+++ b/src/Microservices/Authentication/FileUserHandler.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import json, os
 
diff --git a/src/Microservices/Authentication/Help.py b/src/Microservices/Authentication/Help.py
index ae7c6ec..bbe4ecf 100644
--- a/src/Microservices/Authentication/Help.py
+++ b/src/Microservices/Authentication/Help.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 DSHELP = [
     {
diff --git a/src/Microservices/Authentication/LdapAuthenticator.py b/src/Microservices/Authentication/LdapAuthenticator.py
index dc40f18..78600e4 100644
--- a/src/Microservices/Authentication/LdapAuthenticator.py
+++ b/src/Microservices/Authentication/LdapAuthenticator.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 This module provides an authenticate(username, password) function that uses LDAP to authenticate a user.
diff --git a/src/Microservices/Authentication/WebApplication/Main.js b/src/Microservices/Authentication/WebApplication/Main.js
index 89e7a46..83a32b3 100644
--- a/src/Microservices/Authentication/WebApplication/Main.js
+++ b/src/Microservices/Authentication/WebApplication/Main.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 var WebApplications = WebApplications || [];
 
diff --git a/src/Microservices/Authentication/__init__.py b/src/Microservices/Authentication/__init__.py
index cb4cf07..28abbb4 100644
--- a/src/Microservices/Authentication/__init__.py
+++ b/src/Microservices/Authentication/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''This package contains the handlers for authentication and user groups'''
 
diff --git a/src/Microservices/DataSource/DataSource.py b/src/Microservices/DataSource/DataSource.py
index f92cf85..43bdb39 100644
--- a/src/Microservices/DataSource/DataSource.py
+++ b/src/Microservices/DataSource/DataSource.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import json, logging
 from fnmatch import fnmatch
diff --git a/src/Microservices/DataSource/Help.py b/src/Microservices/DataSource/Help.py
index a3cae7a..40c0208 100644
--- a/src/Microservices/DataSource/Help.py
+++ b/src/Microservices/DataSource/Help.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 DSHELP = [
     {
diff --git a/src/Microservices/DataSource/__init__.py b/src/Microservices/DataSource/__init__.py
index 29a561d..033692d 100644
--- a/src/Microservices/DataSource/__init__.py
+++ b/src/Microservices/DataSource/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 DataSource is a handler that can be used as a hub for other handlers that provide a DsRestAPI interface.
diff --git a/src/Microservices/PerformanceMonitor/PerformanceMonitor.py b/src/Microservices/PerformanceMonitor/PerformanceMonitor.py
index b55cddc..6646851 100644
--- a/src/Microservices/PerformanceMonitor/PerformanceMonitor.py
+++ b/src/Microservices/PerformanceMonitor/PerformanceMonitor.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import random, json, os, time, subprocess, signal, socket, logging, re, string
 from Common.DsRestAPI import DsRestAPI
diff --git a/src/Microservices/PerformanceMonitor/__init__.py b/src/Microservices/PerformanceMonitor/__init__.py
index 7d5ecdf..8a1666c 100644
--- a/src/Microservices/PerformanceMonitor/__init__.py
+++ b/src/Microservices/PerformanceMonitor/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 Performace Monitor tool to show process and system statistics.
diff --git a/src/Microservices/Playlist/Help.py b/src/Microservices/Playlist/Help.py
index 7f07b0b..3d12ad5 100644
--- a/src/Microservices/Playlist/Help.py
+++ b/src/Microservices/Playlist/Help.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 DSHELP = [
     {
diff --git a/src/Microservices/Playlist/Playlist.py b/src/Microservices/Playlist/Playlist.py
index fb4560e..edc21c0 100644
--- a/src/Microservices/Playlist/Playlist.py
+++ b/src/Microservices/Playlist/Playlist.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import os, json, logging
 from Common.DsRestAPI import DsRestAPI
diff --git a/src/Microservices/Playlist/ScheduledPlaylist.py b/src/Microservices/Playlist/ScheduledPlaylist.py
index 0c0ab90..3d060c6 100644
--- a/src/Microservices/Playlist/ScheduledPlaylist.py
+++ b/src/Microservices/Playlist/ScheduledPlaylist.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import sys, json, threading, urllib2, time, logging, re, cookielib, ssl
 
diff --git a/src/Microservices/Playlist/WebApplication/Main.js b/src/Microservices/Playlist/WebApplication/Main.js
index 188c18f..1ebce46 100644
--- a/src/Microservices/Playlist/WebApplication/Main.js
+++ b/src/Microservices/Playlist/WebApplication/Main.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 var WebApplications = WebApplications || [];
 
diff --git a/src/Microservices/Playlist/WebApplication/Models/Model.js b/src/Microservices/Playlist/WebApplication/Models/Model.js
index 63e7fdf..57b61ea 100644
--- a/src/Microservices/Playlist/WebApplication/Models/Model.js
+++ b/src/Microservices/Playlist/WebApplication/Models/Model.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_Model(p_webAppModel) {
     "use strict";
diff --git a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel.js b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel.js
index 43b04ff..d6b5193 100644
--- a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel.js
+++ b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_ViewModel(p_model) {
 
diff --git a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_ElementEditor.js b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_ElementEditor.js
index 7ecea9f..560bd30 100644
--- a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_ElementEditor.js
+++ b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_ElementEditor.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_ElementEditor_ViewModel() {
     "use strict";
diff --git a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_FilterElementEditor.js b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_FilterElementEditor.js
index 809d137..9c27da7 100644
--- a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_FilterElementEditor.js
+++ b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_FilterElementEditor.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_FilterElementEditor_ViewModel() {
     "use strict";
diff --git a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_PlaylistItem.js b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_PlaylistItem.js
index d678ac9..2b2dc5f 100644
--- a/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_PlaylistItem.js
+++ b/src/Microservices/Playlist/WebApplication/ViewModels/Viewmodel_PlaylistItem.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_PlaylistItem_ViewModel(p_model, p_help) {
     "use strict";
diff --git a/src/Microservices/Playlist/WebApplication/Views/View.js b/src/Microservices/Playlist/WebApplication/Views/View.js
index 54ecfcc..c4cfcd8 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View.js
+++ b/src/Microservices/Playlist/WebApplication/Views/View.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_View(p_viewModel, p_parentId, p_viewId) {
     "use strict";
diff --git a/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js b/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js
index 97ec8be..26df1c3 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js
+++ b/src/Microservices/Playlist/WebApplication/Views/View_EditorContainer.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_EditorContainer_View(p_viewModel, p_parent) {
     "use strict";
diff --git a/src/Microservices/Playlist/WebApplication/Views/View_FilterEditor.js b/src/Microservices/Playlist/WebApplication/Views/View_FilterEditor.js
index 9264115..4a6dcfb 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View_FilterEditor.js
+++ b/src/Microservices/Playlist/WebApplication/Views/View_FilterEditor.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_FilterEditor_View(p_viewmodel, p_parent, p_requestPath, p_requestTree, p_helpTree, p_offset) {
 
diff --git a/src/Microservices/Playlist/WebApplication/Views/View_PlaylistItem.js b/src/Microservices/Playlist/WebApplication/Views/View_PlaylistItem.js
index c766639..21fb59b 100644
--- a/src/Microservices/Playlist/WebApplication/Views/View_PlaylistItem.js
+++ b/src/Microservices/Playlist/WebApplication/Views/View_PlaylistItem.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2000-2017 Ericsson Telecom AB                                                       //
 // All rights reserved. This program and the accompanying materials are made available under the     //
-// terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at //
-// http://www.eclipse.org/legal/epl-v10.html                                                         //
+// terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at //
+// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                         //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
 function PlaylistEditor_PlaylistItem_View(p_id, p_viewmodel, p_parent, p_helpTree) {
 
diff --git a/src/Microservices/Playlist/__init__.py b/src/Microservices/Playlist/__init__.py
index 82061d0..de495c1 100644
--- a/src/Microservices/Playlist/__init__.py
+++ b/src/Microservices/Playlist/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 This application can be used to handle Playlists that can be used to issue specific requests by timers and conditions.
diff --git a/src/Microservices/__init__.py b/src/Microservices/__init__.py
index 55aacbf..7a76300 100644
--- a/src/Microservices/__init__.py
+++ b/src/Microservices/__init__.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 '''
 This package contains the microservices.
diff --git a/test/__init__.py b/test/__init__.py
index c20f3a5..3e32020 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,5 +1,5 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/test/runTests.py b/test/runTests.py
index d2d43d6..4347b89 100644
--- a/test/runTests.py
+++ b/test/runTests.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import pytest, sys
 
diff --git a/test/testcases/__init__.py b/test/testcases/__init__.py
index c20f3a5..3e32020 100644
--- a/test/testcases/__init__.py
+++ b/test/testcases/__init__.py
@@ -1,5 +1,5 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/test/testcases/test_AppAgent.py b/test/testcases/test_AppAgent.py
index f9443bf..8e41bd7 100644
--- a/test/testcases/test_AppAgent.py
+++ b/test/testcases/test_AppAgent.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, threading, time, urllib2, shutil, os
 from AppAgent import *
diff --git a/test/testcases/test_Authentication.py b/test/testcases/test_Authentication.py
index f2376d9..5af010c 100644
--- a/test/testcases/test_Authentication.py
+++ b/test/testcases/test_Authentication.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, json
 import Microservices.Authentication
diff --git a/test/testcases/test_BaseGuiConfigHandler.py b/test/testcases/test_BaseGuiConfigHandler.py
index c9e7393..22d21d8 100644
--- a/test/testcases/test_BaseGuiConfigHandler.py
+++ b/test/testcases/test_BaseGuiConfigHandler.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, json
 from Common.BaseGuiConfigHandler import BaseGuiConfigHandler
diff --git a/test/testcases/test_DataSource.py b/test/testcases/test_DataSource.py
index 1e22edd..83599d2 100644
--- a/test/testcases/test_DataSource.py
+++ b/test/testcases/test_DataSource.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, json
 import Microservices.DataSource
diff --git a/test/testcases/test_DsRestAPI.py b/test/testcases/test_DsRestAPI.py
index 4497377..2841049 100644
--- a/test/testcases/test_DsRestAPI.py
+++ b/test/testcases/test_DsRestAPI.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest
 from Common.DsRestAPI import DsRestAPI
diff --git a/test/testcases/test_EditableGroupRights.py b/test/testcases/test_EditableGroupRights.py
index 0141bf6..c3128a9 100644
--- a/test/testcases/test_EditableGroupRights.py
+++ b/test/testcases/test_EditableGroupRights.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, json
 from Common.EditableGroupRights import EditableGroupRights
diff --git a/test/testcases/test_Playlist.py b/test/testcases/test_Playlist.py
index c8db916..532872b 100644
--- a/test/testcases/test_Playlist.py
+++ b/test/testcases/test_Playlist.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, json, time, os
 import Microservices.Playlist
diff --git a/test/testcases/test_integration.py b/test/testcases/test_integration.py
index 34e08bb..1763037 100644
--- a/test/testcases/test_integration.py
+++ b/test/testcases/test_integration.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import unittest, threading, time, urllib2, cookielib, os
 from AppAgent import *
diff --git a/test/utils/MockedHandler.py b/test/utils/MockedHandler.py
index 6054b38..a3d9ecd 100644
--- a/test/utils/MockedHandler.py
+++ b/test/utils/MockedHandler.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 import copy, json
 from Common.DsRestAPI import DsRestAPI
diff --git a/test/utils/Utils.py b/test/utils/Utils.py
index e139d6b..441cbd5 100644
--- a/test/utils/Utils.py
+++ b/test/utils/Utils.py
@@ -1,7 +1,7 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////
 ADMIN = {
     "username": "admin",
diff --git a/test/utils/__init__.py b/test/utils/__init__.py
index c20f3a5..3e32020 100644
--- a/test/utils/__init__.py
+++ b/test/utils/__init__.py
@@ -1,5 +1,5 @@
-#// Copyright (c) 2000-2017 Ericsson Telecom AB                                                         //
+#// Copyright (c) 2000-2018 Ericsson Telecom AB                                                         //
 #// All rights reserved. This program and the accompanying materials are made available under the terms //
-#// of the Eclipse Public License v1.0 which accompanies this distribution, and is available at         //
-#// http://www.eclipse.org/legal/epl-v10.html                                                           //
+#// of the Eclipse Public License v2.0 which accompanies this distribution, and is available at         //
+#// https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html                                                           //
 #/////////////////////////////////////////////////////////////////////////////////////////////////////////