Merge branch '43'
Merge branch '45'
cleanup, no change
CAY-1971 Variants of Property.like(..) : contains(..), startsWith(..), endsWith(..)

* fixing escaping bug
* escaping unit tests
Merge remote-tracking branch 'origin/master'