am 12f411d9: Merge "Correction to use of TEMP_FAILURE_RETRY in send_prop_msg"

* commit '12f411d9a696ca7a0fe490fb530a9accbda66a99':
  Correction to use of TEMP_FAILURE_RETRY in send_prop_msg