Merge branch 'release/3.0' into develop
cosmetic changes.
20130419 added printf() for zfs_getattr and zfs_getsecattr, added /execname=="nfsd"/ filter.
bug fix on dtrace option
Merge branch 'release/3.1'