delete conflict DATA classes (refs #4168)
correct autoload detect error (refs #4168)
delete conflict pos2js classes (refs #4168)
Merge pull request #946 from Eric-Brison/3.2-I4168

delete conflict DATA classes (closes #4168)
Merge pull request #940 from thingthing/3.2-I4152

Export docid logicalname and image in htmltext attribute (closes #4151, closes #4152)
Restore vault table even if no file are saved in archive (refs #4163)