Government to replace warning picture of ‘John Terry’ on cigarette packs