Finished pre patch day merge

http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java

@@ -96,28 +96,56 @@ public class RuneLiteAPI
 			.build();
 	}
 
-	public static HttpUrl getApiRoot()
+	public static HttpUrl getSessionBase()
 	{
-		return HttpUrl.parse(BASE);
+		final String prop = System.getProperty("runelite.session.url");
+
+		if (prop != null && !prop.isEmpty())
+		{
+			return HttpUrl.parse(prop);
+		}
+
+		return HttpUrl.parse(BASE + "/session");
 	}
 
-	public static HttpUrl getSessionBase()
+	public static HttpUrl getRuneLitePlusSessionBase()
 	{
 		return HttpUrl.parse(RLPLUS);
 	}
 
 	public static HttpUrl getApiBase()
 	{
+		final String prop = System.getProperty("runelite.http-service.url");
+
+		if (prop != null && !prop.isEmpty())
+		{
+			return HttpUrl.parse(prop);
+		}
+
 		return HttpUrl.parse(BASE + "/runelite-" + getVersion());
 	}
 
 	public static HttpUrl getStaticBase()
 	{
+		final String prop = System.getProperty("runelite.static.url");
+
+		if (prop != null && !prop.isEmpty())
+		{
+			return HttpUrl.parse(prop);
+		}
+
 		return HttpUrl.parse(STATICBASE);
 	}
 
 	public static HttpUrl getWsEndpoint()
 	{
+		final String prop = System.getProperty("runelite.ws.url");
+
+		if (prop != null && !prop.isEmpty())
+		{
+			return HttpUrl.parse(prop);
+		}
+
 		return HttpUrl.parse(WSBASE);
 	}