Moved make_IndicatorItem_node and make_Indicator_node.  Minor changes to work with both 1.0 and 1.1 IOCs