Merge "Correct 'list index out of range' error in dhcp agent test"