Martin Whitmarsh is reunited with Mansour Ojjeh, co-owner, McLaren