move a few blocks to where they belong
merge test_failed() into openflow_error()
factor common code into kickstart_next_round()
fix vendor ext for NEC