master-qa-6632

http://issues.liferay.com/browse/LIFERAYQA-6632

Hi Brian,

This was a resend of this pull request:
https://github.com/brianchandotcom/liferay-portal/pull/15916

You had said you wanted to go over it in person too.

So, don't review this one yet.

Thanks!

-Hashi