Issue-1461

This should be good enough to close 1461.

I'll run some further tests with other loads later today.
Maybe you could run some on your setup (and squash the commits before sending a pull request to zfsonlinux) ?