OO-2656: write the context path in the url of the WebDAV link

src/main/java/org/olat/core/commons/modules/bc/FolderManager.java

@@ -36,6 +36,7 @@ import org.olat.core.commons.modules.bc.meta.MetaInfoFactory;
 import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
 import org.olat.core.helpers.Settings;
 import org.olat.core.manager.BasicManager;
+import org.olat.core.util.WebappHelper;
 import org.olat.core.util.vfs.OlatRelPathImpl;
 import org.olat.core.util.vfs.VFSItem;
 import org.olat.core.util.vfs.VFSLeaf;
@@ -53,14 +54,14 @@ public class FolderManager  extends BasicManager {
 	 */
 	public static String getWebDAVHttp() {
 		if(Settings.isInsecurePortAvailable()) {
-			return Settings.getInsecureServerContextPathURI() + "/webdav";
+			return Settings.getInsecureServerContextPathURI() + WebappHelper.getServletContextPath() + "/webdav";
 		}
 		return null;
 	}
 	
 	public static String getWebDAVHttps() {
 		if(Settings.isSecurePortAvailable()) {
-			return Settings.getSecureServerContextPathURI() + "/webdav";
+			return Settings.getSecureServerContextPathURI() + WebappHelper.getServletContextPath() + "/webdav";
 		}
 		return null;
 	}