Fix for optimizer not choosing point lookup and optimized out order
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix