Musk’s inclusion is the latest sign the relationship between the US president and world’s richest man has been repaired.