LPS-44110

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/LPS-44110.

NOTE:  I am not sure if we should be editing QA test's (https://github.com/jonmak08/liferay-portal/commit/1c37cf7c61f1aa6080c0be9955e5bc208a08bf94), but since China sent this over and they work closely with QA, I left it in.

Please let me know if you have any questions.  Thanks!