master-qa-5674

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