WL-3501 Fix the entity broker json parsing