Merge "Add UT for CatalogDbAdapterRestTest"