Merge remote-tracking branch 'origin/temp8' into temp8-U4-11220

# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.cs

src/Umbraco.Web/PublishedCache/NuCache/DataSource/BTree.DictionaryOfPropertyDataSerializer.cs

@@ -33,7 +33,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                     pdatas.Add(pdata);
 
                     // everything that can be null is read/written as object
-                    pdata.LanguageId = ReadIntObject(stream);
+                    pdata.Culture = ReadStringObject(stream);
                     pdata.Segment = ReadStringObject(stream);
                     pdata.Value = ReadObject(stream);
                 }
@@ -61,7 +61,7 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
                 foreach (var pdata in values)
                 {
                     // everything that can be null is read/written as object
-                    WriteObject(pdata.LanguageId, stream);
+                    WriteObject(pdata.Culture, stream);
                     WriteObject(pdata.Segment, stream);
                     WriteObject(pdata.Value, stream);
                 }

src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs

@@ -4,8 +4,8 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
 {
     internal class PropertyData
     {
-        [JsonProperty("lang")]
-        public int? LanguageId { get; set; }
+        [JsonProperty("culture")]
+        public string Culture { get; set; }
 
         [JsonProperty("seg")]
         public string Segment { get; set; }
@@ -13,4 +13,4 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         [JsonProperty("val")]
         public object Value { get; set; }
     }
-}
+}