Magnetic phase diagram of underdoped YBa2Cu3Oy inferred from torque magnetization and thermal conductivity