WP-3331: Move type field to below name.
WP-3331: Update the DB for the new primary key on {gsb_connecting_link}.