CONN-668:HIEOS Changes needed for cxf'ying