Merge change 27333 into eclair

* changes:
  convert id to full-selfattendance as well. check for null before doing conversion. fix typo where we were inserting an extra / as part of conversion.