Virgin Galactic finishes lengthy spacecraft upgrades, plans Q2 commercial service