FS-5794 --resolve
swigall
Fix bootstrap from the removal of mod_html5 in previous commit and cleanup some other reference to it