master-qa-5778

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