Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"