(Merge tag 'clone-5.7.22-build' into mysql-5.7-cluster-7.5)

Change-Id: I9aef1ca5acd2584a2482d64eb852bea3901967ad