Update remotes and branches on hamachi port

Change-Id: Ied378c9a0636916171d286352a5425a93df5b31b