Using substitutions and 17O nmr to probe the susceptibility χ′(q) in underdoped YBa2Cu3O6+y and HgBa2CuO4+δ compounds