* Undo overzealous merge choices * Undo temporary changes applied when part of the repo was building in the blazor-wasm branch * Skip SPA template tests in 3.1