update the plans for the DISTINCT queries

It's a change for DISTINCT queries: from DISTINCT plan node to inline Aggregate plan node.
This is the default behaviour by running "ant plannertestrefresh". I create a ticket to track this problem: ENG-7247 and will merge the pull request now. 

Thanks.