Merge pull request #987 from sstranz/develop

Fix OIS class for ConstantScoreQuery

Author: Mpdreamz

src/Nest/DSL/Query/ConstantScoreQueryDescriptor.cs

@@ -22,18 +22,20 @@ public interface IConstantScoreQuery : IQuery
 		double? Boost { get; set; }
 	}
 
-	public class ConstantScoreQuery : PlainQuery, ICustomScoreQuery
+	public class ConstantScoreQuery : PlainQuery, IConstantScoreQuery
 	{
 		protected override void WrapInContainer(IQueryContainer container)
 		{
-			container.CustomScore = this;
+			container.ConstantScore = this;
 		}
 
 		public bool IsConditionless { get { return false; } }
 		public string Lang { get; set; }
 		public string Script { get; set; }
 		public Dictionary<string, object> Params { get; set; }
 		public IQueryContainer Query { get; set; }
+		public IFilterContainer Filter { get; set; }
+		public double? Boost { get; set; }
 	}
 
 	public class ConstantScoreQueryDescriptor<T> : IConstantScoreQuery where T : class