Fix/master/issue 3542: [optimizeQueries Map config property cannot be set declaratively]

PR for issue #3542