Merge pull request #2407 from opscode/sersut/ci-fix-sparc

Fix unit specs on Sparc.
Merge pull request #2410 from opscode/sersut/port-sparc-fix

Merge pull request #2407 from opscode/sersut/ci-fix-sparc