master-qa-6557

http://issues.liferay.com/browse/LIFERAYQA-6557

We basically reverted changes made by this ticket: https://issues.liferay.com/browse/LIFERAYQA-6272.  It made tests run 2x slower, and didn't add a lot of value.