Fix deprecated search method
Entity to Map coercion support.
Merge branch 'groovy2'