Merge "test_rebuild_server tolerant of imageRef as URI"