MFC r257859:

Fix typo in include guard, found by clang 3.4.
Merge remote-tracking branch 'upstream/stable/9' into stable/9
Merge branch 'stable/9' into stable-9-atf