Closes #3274419
Issue #3265574 by mondrake: Convert remaining assertions involving use of xpath to WebAssert, where possible