master-qa-5710

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