master-qa-4666

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