[KRACOEUS-8530][KRACOEUS-8374] Override and fixes for add line dialog fixes, also reversion of attachment fix to be in line with the fix in rice, correct file returned for subaward