Merge of r4396: Some questionable optomizations flags for icc were removed in order to simplify support of its future versions.