Rory McIlroy could be spared the potentially divisive decision over which country to represent when golf returns to the Olympics in 2016.