Reorganize Service Catalog

Currently each service catalog call handles it's own parsing and
filtering. Modify this so that each function calls back to another
public function ensuring that filtering and parsing is only handled
once.

This allows us to consolidate some helper methods into the base class
and generally clean up.

Change-Id: I15777436af06baea903182f4b3b5913e2890afd1
Merge "Reorganize Service Catalog"