Messaging reorg fixes, Fix document uploads for new web2py, Doc roles for DRMP tweaked