Add service catalog lookup for metadata repository

Change-Id: I44ba8d88c10f21de5afa28803bfc3dc0db8f9923
Merge "Add service catalog lookup for metadata repository"