Fixed re-connect to lockdownd for file_relay; added some more comments to merged code.