Merge "Add jumphost to the managed servers"