PROV-860 Shift context of relationship labels to relationship rather than related item when evaluating template. Also do some cleanup in preparation for PROV-858