Revert "change service catalog lookup to be type based"

This reverts commit 3753b5f1a1c5b4dc43b96786a0e1f1ee4325e7fe.

Conflicts:
	lib/fog/hp/storage.rb