#7516 Replace the css submit button locator with a keyword

This includes an explicit wait, so it should make the tests more
consistent.