SWR 2.0 Upgrades

Upgrades to SWR API 2.0, some failing tests (looks like issues with the tests themselves?) Send to Spring Extension authors for review.