Merge the Isilon ATF code

This is a placeholder merge request to go over all of the items to ensure that I understand everything, some of the items from Isilon can be dropped as I dropped them from the atf branch (diff reduction), and make sure that any valid fixes from NetBSD can be pushed back.
Need to verify whether these two lines are upstream or not (most likely yes)