merge function rename from org master
Merge org-mode base changes (build-style -> build-head).
Merge changes to style properties in ox-html.
* ox-deck.el: Remove overrides for html-style(-extra) (unneeded) and change
  names of include properties
* ox-s5.el: Same as above.
remove unneeded option override