Fix JDF-558. Update the WHERE clause so that it will Filter.

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.

If you want to observe this turn on the "show-sql" and "format_sql" in the persistence.xml.