Changed predicate normalization to use delegation instead of an abstract class
Introduce MatchPredicateNormalizer chaining to avoid multi pass predicate rewriting

o Introduce PartialFunctionSupport
o Remove old PredicateRewriter
Merge pull request #2086 from boggle/2.1-normalize-node-labels

2.1 refactor match predicate extraction