Fix JDF-558. Update the WHERE clause so that the Filter in kitchensink-spring-matrixvariables would handle an AND condition. One WHERE clause was overwriting the other.