Fix test so it runs on both FreeBSD and Linux
Aliases can be specified both with the aliases= tag and as lines with the same port/proto
Merge branch 'isilon-atf' of github.com:yaneurabeya/freebsd into isilon-atf