Merge "trunk: Start dhclient only if it's not running"