Merge "Update kind version in jjb"