Merge branch 'pull-628' * pull-628: Give priority to the build directory headers Do not ship evconfig-private.h in dist archive Closes: #628 (cherry picked from commit a5f19422fdc91cf1e645fc318a174f33f132b9ac)