Merge branch 'mysql-trunk-cluster' into mysql-trunk

Change-Id: I033ba12816e0f43bb9c7efc70155027663d61aee