CAL-936 Calendar unified search got ineffectively memory usage cause OOME
CAL-936 Improve unified query of calendar connector
CAL-936 minor fix on search query
Merge commit '66c80e4ecfbaefc70c412977367ab5636ca9d202' into HEAD