Backport convert-conf fix from head; remove bogus /dev/poll assertion.