Fixes #945 - Model the relationship between Catalogs and Site as a new explicit join entity