Merge "Move add/remove fixed ip action to servers_client"