master-bc-2815

https://issues.liferay.com/browse/LIFERAYQA-11624
https://issues.liferay.com/browse/LIFERAYQA-11820
https://issues.liferay.com/browse/LIFERAYQA-11761
https://issues.liferay.com/browse/LIFERAYQA-11909

Hi Brian.

The changes to build-test.xml, test.properties, and TestPropsValues.java are so that we can add another set of credentials that we can use to log into marketplace so that we can automate marketplace tests. Currently email addresses / passwords 1-4 are already being used by other tests, so I added a 5th one. I've also cherry picked those specific commits into ee-6.1.x and ee-6.1.30. Those pulls are here:
https://github.com/brianchandotcom/liferay-portal-ee/pull/7476
https://github.com/brianchandotcom/liferay-portal-ee/pull/7477