Make include/Makefile honor MK_GSSAPI == no

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