Matthew Mott has been replaced as England white-ball coach by Buttler's close friend Brendon McCullum, who has taken charge almost three years after he was initially chased for the role.