(PUP-3753) Improve performance of zfs checks.
Merge pull request #3404 from skoef/master

(PUP-3753) Improve performance of zfs checks.
Revert "(PUP-659) Optimize qualified variables"

Reverts puppetlabs/puppet#3359. This pull request was causing two
acceptance failures: tests.ticket_4293_define_and_use_a_define_within_a_class.rb
and tests/parser_functions/hiera_array.lookup_data.rb. These tests
were both failing with an Invalid resource type error.

This seems to be happening because we not longer have the fully qualified
named for the defined type when the resource is created (i.e. do_notify
rather than foo::do_notify). It's not clear whether this is the intended behavior
or a bug, and what should be changed in order to fix the issue. Thus, it is
being reverted until the original author can make the necessary changes.
Merge pull request #3410 from puppetlabs/revert-3359-PUP-659_optimize-qualified-variables

Revert "(PUP-659) Optimize qualified variables"