master-qa-4233

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