This reverts commit 54022375. Revert "zfs_git: 2015-05-13 -> 2015-06-22" This reverts commit 59faa759. Closes #8941