Merge "Mark test_server_connectivity_reboot as slow"