master-qa-5158

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