change service catalog lookup to be type based
change to OS type request on failure
make default lookup key in ServiceCatalog type and not name
dont run a real test if the mocks are enabled
Merge branch 'bug/handle_helion'