fixes #5580 - pin scoped_search for Ruby 1.8 compatibility

(cherry picked from commit e8025bf890d27cbafff91bc527aeeee39796d673)

Conflicts:
	Gemfile
fixes #4590 - convert VMware SCSI controller type during creation

(cherry picked from commit 7e27bdf3a593f0e2ac0661f4a3c9a9bb3ab6227c)

Conflicts:
	app/models/compute_resources/foreman/model/vmware.rb
	test/unit/compute_resources/vmware_test.rb