update the plans for the DISTINCT queries

It's a change for DISTINCT queries: from DISTINCT plan node to inline Aggregate plan node.
I use "ant plannertestrefresh" to get the new plan.