openssh: two more unneeded directives removed.
butch-relocate: use new copy strategy for var and etc as well
Merge remote-tracking branch 'n0v/sshd_cleanup'