master-qa-4720

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