Fix xauth|ssh-askpass locations
Merge branch '5.8p2'

* 5.8p2:
  Fix xauth|ssh-askpass locations

Conflicts:
	Makefile