[CLEANUP] - these are all changes to support the change in FunUtil.compareSiblingMembers so that comparing members always uses orderKey instead of falling back to ordinals.  Fixes two failing unit tests, SegmentCacheTest.testMemberWithNullKey and BasicQueryTest.testMemberWithNullKey