Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5

Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config

src/Umbraco.Core/Sync/DefaultServerMessenger.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Threading;
+using System.Web;
 using System.Web.Script.Serialization;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
@@ -520,7 +521,7 @@ namespace Umbraco.Core.Sync
             }
         }
 
-        private IEnumerable<IAsyncResult> GetAsyncResults(List<IAsyncResult> asyncResultsList, out List<WaitHandle> waitHandlesList)
+        internal IEnumerable<IAsyncResult> GetAsyncResults(List<IAsyncResult> asyncResultsList, out List<WaitHandle> waitHandlesList)
         {
             var asyncResults = asyncResultsList.ToArray();
             waitHandlesList = new List<WaitHandle>();

src/Umbraco.Core/Sync/RefreshInstruction.cs

@@ -0,0 +1,63 @@
+using System;
+
+namespace Umbraco.Core.Sync
+{
+    [Serializable]
+    public class RefreshInstruction
+    {
+        public RefreshMethodType RefreshType { get; set; }
+        public Guid RefresherId { get; set; }
+        public Guid GuidId { get; set; }
+        public int IntId { get; set; }
+        public string JsonIds { get; set; }
+        public string JsonPayload { get; set; }
+
+        [Serializable]
+        public enum RefreshMethodType
+        {
+            RefreshAll,
+            RefreshByGuid,
+            RefreshById,
+            RefreshByIds,
+            RefreshByJson,
+            RemoveById
+        }
+
+        protected bool Equals(RefreshInstruction other)
+        {
+            return RefreshType == other.RefreshType && RefresherId.Equals(other.RefresherId) && GuidId.Equals(other.GuidId) && IntId == other.IntId && string.Equals(JsonIds, other.JsonIds) && string.Equals(JsonPayload, other.JsonPayload);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((RefreshInstruction) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = (int) RefreshType;
+                hashCode = (hashCode*397) ^ RefresherId.GetHashCode();
+                hashCode = (hashCode*397) ^ GuidId.GetHashCode();
+                hashCode = (hashCode*397) ^ IntId;
+                hashCode = (hashCode*397) ^ (JsonIds != null ? JsonIds.GetHashCode() : 0);
+                hashCode = (hashCode*397) ^ (JsonPayload != null ? JsonPayload.GetHashCode() : 0);
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(RefreshInstruction left, RefreshInstruction right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(RefreshInstruction left, RefreshInstruction right)
+        {
+            return !Equals(left, right);
+        }
+    }
+}

src/Umbraco.Core/Sync/ServerSyncWebServiceClient.cs

@@ -4,7 +4,6 @@ using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Sync
 {
-    
     /// <summary>
     /// The client Soap service for making distrubuted cache calls between servers
     /// </summary>
@@ -21,6 +20,31 @@ namespace Umbraco.Core.Sync
 
         }
 
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/BulkRefresh", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void BulkRefresh(RefreshInstruction[] instructions, string login, string password)
+        {
+            this.Invoke("BulkRefresh", new object[] {
+													   instructions,
+													   login,
+													   password});
+        }
+
+        /// <remarks/>
+        public System.IAsyncResult BeginBulkRefresh(RefreshInstruction[] instructions, string login, string password, System.AsyncCallback callback, object asyncState)
+        {
+            return this.BeginInvoke("BulkRefresh", new object[] {
+																   instructions,
+																   login,
+																   password}, callback, asyncState);
+        }
+
+        /// <remarks/>
+        public void EndBulkRefresh(System.IAsyncResult asyncResult)
+        {
+            this.EndInvoke(asyncResult);
+        }
+
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://umbraco.org/webservices/RefreshAll", RequestNamespace = "http://umbraco.org/webservices/", ResponseNamespace = "http://umbraco.org/webservices/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public void RefreshAll(System.Guid uniqueIdentifier, string Login, string Password)