More catalog work, merge in the non-queryplan and non-btree changes of queryplan and optimize more of date range index internals