Merge "Move test_restore_server_invalid_state test to admin test"