fixed three failng unit tests

Author: Mpdreamz

src/Nest/DSL/Query/FunctionScoreQueryDescriptor.cs

@@ -117,7 +117,7 @@ bool IQuery.IsConditionless
 			get
 			{
 				return _forcedConditionless
-				       || ((Self.Query == null || Self.Query.IsConditionless || Self.Filter == null || Self.Filter.IsConditionless)
+				       || (((Self.Query == null || Self.Query.IsConditionless) && (Self.Filter == null || Self.Filter.IsConditionless))
 				           && Self.RandomScore == null && Self.ScriptScore == null && !Self.Functions.HasAny());
 			}
 		}

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -854,6 +854,9 @@
     <None Include="Reproduce\Issue876.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Reproduce\PatchedTermsAggSort.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Search\Aggregations\Terms\TermAggregationSerializes.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>