Switch/fix order of webodf_bootstrap/dojo-amalgamation execution

(and remove no longer needed fixes)