master-bc-1112

https://issues.liferay.com/browse/LIFERAYQA-7637

Hey Brian, as an FYI we're going to diverge the master, ee-6.2.x, and ee-6.2.10 tests now. This pull request is only for master. So I'll only send pull requests for the branches that need that commit.