as preparation for pushing into trunk.

Note: I removed the extended on-push tests
collection for the mysql-trunk-wl5217
specific branch.