Refactoring MondrianDef constructions into factory
Fixed Mondrian schema generation
Mondrian schema work in progress
Merged with upstream
Merged with upstream