Keeping the UUID on account update (bug 969145)

https://bugzilla.mozilla.org/show_bug.cgi?id=969145
Merge pull request #1772 from davidbgk/969145-uuid-update

Keeping the UUID on account update (bug 969145)