An Edinburgh man, who was reported missing two weeks ago, has been arrested in connection with an outstanding warrant.