SAKIII-5487 Restoring versions wipes away widget user content (e.g., discussion messages and comments)
SAKIII-5487 Restoring versions wipes away widget user content (e.g., discussion messages and comments)

Squashed commit of the following:

commit e59416c6d80e26edf58862e28b22c1ad60afb909
Merge: 0e81d85 f177fd8
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Tue Apr 17 10:27:34 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-5487' into bp323-SAKIII-5487

commit f177fd852a921baf91833b647932deb326085322
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Apr 17 15:56:07 2012 +0100

    SAKIII-5487 Restoring versions wipes away widget user content

commit 35e5db9b2403bd4b528674d8088320faa3d43421
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Mon Apr 16 23:26:23 2012 -0700

    SAKIII-5487 - don't remove comments on restore
    https://jira.sakaiproject.org/browse/SAKIII-5487

Orodan/3akai-ux,ets-berkeley-edu/3akai-ux,Orodan/3akai-ux,timdegroote/3akai-ux,Orodan/3akai-ux-jitsi-fork,Orodan/3akai-ux,nicolaasmatthijs/3akai-ux,jonmhays/3akai-ux,jfederico/3akai-ux,ets-berkeley-edu/3akai-ux,Orodan/3akai-ux-jitsi-fork,rhollow/MYB-1615,Coenego/3akai-ux,nicolaasmatthijs/3akai-ux,simong/3akai-ux,mrvisser/3akai-ux,mrvisser/3akai-ux,mrvisser/3akai-ux,simong/3akai-ux,jonmhays/3akai-ux,stuartf/3akai-ux,stuartf/3akai-ux,jfederico/3akai-ux,rhollow/MYB-1615,nicolaasmatthijs/3akai-ux,timdegroote/3akai-ux,ets-berkeley-edu/3akai-ux,Orodan/3akai-ux-jitsi-fork,jonmhays/3akai-ux,simong/3akai-ux,rhollow/MYB-1615,jfederico/3akai-ux,timdegroote/3akai-ux,Coenego/avocet-ui,stuartf/3akai-ux,Coenego/3akai-ux,Coenego/avocet-ui