correct equals/hashCode for delegating scopes
(cherry picked from commit 03ee8a5) [r=Maxim.Mossienko]
check for property name search cost in PostHighlightingPass
(cherry picked from commit 9ff7d28) [r= Maxim.Mossienko]