Buttler retained as captain in both formats and among six players from the World Cup to be picked in the ODI squad