Comment 23 for bug 1317293

I believe the heat part of this is now complete - IRC feedback from asalkeld indicated that with the fix for bug #1342593 and the patches proposed for this bug, he was able to successfully update with a trust-scoped token, so marking the heat part of this as fix committed.

Angus, please let me know if you think there are remaining issues and we can capture them in a follow-up bug.