master-qa-5791

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