Merge remote-tracking branch 'pingcap/feature/reorganize-partition' i…

…nto feat-reorg-part-merge-master

by git merge -s ours pingcap/feature/reorganize-partition
Since it should be the same as pingcap/master still...