Mondrain 2229

Hi, @lucboudreau! 
Could you review new changes? 
The mondrian part is here:
https://github.com/pentaho/mondrian/pull/395
Thanks, Yury.