magit-gitk-executable: fix setting default value
magit-{insert,put-face-property}: don't specify overlay priority

We cannot specify the default priority because the overlays created to
refine hunks (by code in `smerge-mode.el') also are created without the
priority being explicitly specified.  When the priority is undefined,
then it defaults to 1.  In our case there are several overlays with that
priority at the same buffer position, but it seems the correct on wins.

Apparently if there are multiple overlays with the same priority then
the one which was created later is prioritized.  It so happens that this
is what we need here, but we just got lucky and this should be fixed in
Emacs.
Merge branch 'master' into next

Conflicts:
	magit.el
magit-wash-hunk: refine hunk outside of magit-with-section

I repeat myself but "due to limitation in the section code", we have to
delay refining the hunk until after the call to `magit-with-section'.
More precisely the "@@..." header has not been reinserted yet when the
BODY of this macro is evaluated, and so any textual search for the
beginning of the hunk causes an error.
magit-diff-highlight-whitespace: improve trailing-wspace regexp