Preliminary implementation of new Service Catalog spec.

Change-Id: I712d2ecafa8af8467e19dfb29bf8ef7341ea2d80