master-qa-6634

http://issues.liferay.com/browse/LIFERAYQA-6634