JENA-595 , JENA-432 , JENA-616 , JENA-293 , JENA-383

Put filter equality rewrite after filter placement because
it may then be possible to apply it when it could not when
covering a larger pattern.

Modify some test that were sensitive to this.

git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1553306 13f79535-47bb-0310-9956-ffa450edef68