WP-3944: Update branch for gsb_feature_base_fields and gsb_feature_file_types.