[NUCCORE-1259] Clean up ConnectionFactory resourceType info