Better fix for MONDRIAN-1432.

Conflicts:

	src/main/mondrian/rolap/agg/DenseDoubleSegmentBody.java
	src/main/mondrian/rolap/agg/DenseIntSegmentBody.java
	src/main/mondrian/rolap/agg/SegmentBuilder.java
	testsrc/main/mondrian/rolap/agg/SegmentBuilderTest.java
	testsrc/main/mondrian/test/BasicQueryTest.java