master-qa-7841

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