Merge pull request #1448 from kurtwalker/ANALYZER-2402

[ANALYZER-2402] - new implementation of XmlaExtra that will delegate cal...
[ANALYZER-2402] - correcting unit test