Add find catalog via name & type (type is optional).

Change-Id: Iac686cbcaed029bbfd0b3c641b5e7fada0a05bf2