Monkey patch comparing null to prevent class cast exception [MONDRIAN-1610]
Re-enable QueryPlan execution path
Add two axis path to unit test
Check in Friday's refactorings