(maint) Fix Solaris 10 spec failures

Without this patch applied we're seeing failures in the Solaris 10 spec
tests.  The root cause of this problem is a stub method that affects too
much of the system as a whole rather than the unit being tested.

This patch addresses the problem by narrowing the scope of the method
stub to limit the overall effect on the system.
Merge branch 'maint/1.7.x/fix_solaris_spec_issue' into 1.7.x

* maint/1.7.x/fix_solaris_spec_issue:
  (maint) Fix Solaris 10 spec failures
Merge branch '1.7.x'

* 1.7.x:
  (maint) Fix Solaris 10 spec failures
(maint) Fix failing manufacturer spec on Solaris 10

Without this patch the specs are failing against solaris 10.  The root
cause of the problem is that the manufacturer spec is getting a value
from a different resolver than the one being tested.  The example
expected the result to be nil rather than being resolved by the
alternative resolver.

This patch fixes the issue by changing the expectation such that the
manufacturer spec is not the value set by the resolver being tested.
Merge branch 'maint/1.6.x/fix_solaris_specs' into 1.6.x

* maint/1.6.x/fix_solaris_specs:
  (maint) Fix failing manufacturer spec on Solaris 10
Merge branch '1.6.x' into 1.7.x

* 1.6.x:
  (maint) Fix failing manufacturer spec on Solaris 10
Merge branch '1.7.x'

* 1.7.x:
  (maint) Fix failing manufacturer spec on Solaris 10