Merge of fix for MONDRIAN-1085, Mondrian does not recognize [dimension].[hierarchy] in <AggName> element for defining agg tables, even if SsasCompatibleNaming=true

Conflicts:

	testsrc/main/mondrian/rolap/aggmatcher/NonCollapsedAggTest.java