Merge pull request #315 from opscode/sersut/pick-libpath

Pick up libpath fixes in omnibus-software.
Conflicts:
	Gemfile.lock