master-qa-6321

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