Use ServiceCatalog.factory, the object has no __init__

Fixes LP bug #1199281

Change-Id: Iba4b3fd8ad2e6fe054ed705d8990c13dc5a13430
Merge "Use ServiceCatalog.factory, the object has no __init__"