Merge proposals dependent on lp://qastaging/~laurynas-biveinis/percona-server/tokudb-clustering-query-opt

1. tokudb-clustering-query-opt
2. Dependent merge proposals