master-qa-9333

http://issues.liferay.com/browse/LIFERAYQA-9333

@brianchandotcom - This pull request only is need within master.  It doesn't affect ee-6.2.x/ee-6.2.10/ee-6.1.x/ee-6.1.30