master-bc-1964

https://issues.liferay.com/browse/LIFERAYQA-9818

The ee-6.1.x and ee-6.1.30 pulls (https://github.com/brianchandotcom/liferay-portal-ee/pull/5858 and https://github.com/brianchandotcom/liferay-portal-ee/pull/5859) contain Ken's commit to test.properties so that we keep test.properties consistent across the different branches.