making some changes to the way bootstrapping happens and updating metadata migration in preparation for final migration