Merge "Add test "attach_previously_used_port_to_new_instance""