Merge the stat2 query planner enhancements into the trunk.

FossilOrigin-Name: 499edcbc8ab70fcf35431d4e672c68dbcb6c5aad