Pats on back, all smiles as Macron, Johnson appear to bury hatchet for G7