OS-1244 vfsstat output is confusing
OS-2563 zpool get -p is broken
OS-2568 sys/rwlock.h isn't quite valid C anymore
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec