integrate saiku-query for new mdx generation optionally
Merge branch 'master' into saiku3