Golf and rugby set to return to the Olympic Games