Sync files with upstream and add mysql-extra