backport fix for issue #3542 for hazelcast-core
backport unit test for issue #3542 for hazelcast-core
backport fix for issue #3542 for hazelcast-spring
backport unit test for issue #3542 for hazelcast-spring
Merge pull request #3596 from serkan-ozal/fix/3.x/issue-3495

Backport Fix/3.x/issue 3542: [optimizeQueries Map config property cannot be set declaratively]