master-qa-4257

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