master-qa-4258

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