Merge "Disable 'project_id' validation on test_share_servers"