Unit test fail, mvtreemap error, trying fixing it
Merge branch 'applypatch' into testmerge

Conflicts:
	h2/src/main/org/h2/index/IndexCursor.java