Issue #3265574 by mondrake: Convert remaining assertions involving use of xpath to WebAssert, where possible (cherry picked from commit c900c8d3)