The magnetic phase diagram of underdoped YBa 2 Cu 3 O y inferred from torque magnetization and thermal conductivity