Make include/Makefile honor MK_GSSAPI == no

Add necessary entries to OptionalObsoleteFiles.inc
Merge branch 'master' of github.com:yaneurabeya/freebsd
Merge branch 'master' into atf