master-bc-930

https://issues.liferay.com/browse/LIFERAYQA-6541

This is a re-sending of:
https://github.com/brianchandotcom/liferay-portal/pull/15693

I learned that we can use the "|" operator (http://www.w3schools.com/xpath/xpath_operators.asp). This way it accounts for the fact that it's a span in ee-6.2.x and a button in ee-6.2.10.