LPS-42864 remove old code to obtain the logo from organizations (breaks tests)
LPS-42673 Suffix description fields id to make them unique