master-qa-5720

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