NOJIRA Address issues with display of bundle display templates using "hierarchy" paths
PROV-620 Fix fetch of hierarchies through mild-rewrite of preferred labels code