Corrections to sio mule common to remove conflicts

Conflict messages were left in sio_mule_common, this removes them, and updates the flortd.py parser to not pass the recovered flag (the argument changed from recovered_flag to recovered).