#7516 Simplify some locators, replace xpath with link text or name

This does not appear to work for "Wait Until Page Contains Element"
but it's quite good to use a simpler locator for buttons and links
which are clicked.
#7516 replace xpath expression for the next button with a simpler locator
#7516 Replace xpath expr for submit button with simpler css selector
#7516 Replace xpath expr for the Skip button with css selector