Merge #1510

diff --cc src/bin/auth/main.cc
Simple merge

diff --cc src/bin/bind10/bind10_src.py.in
Simple merge

diff --cc src/bin/resolver/main.cc
index ef995c2b24349672809b4bfdf1d2830fd9ff9eab,d563e08550e96ae874a7cf5982c4b6825c41c559..48344588816de40da71c9bbc5cfd5a71711b4a4a
--- 1/src/bin/resolver/main.cc
--- 2/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@@ -41,11 -41,8 +41,10 @@@
  #include <cc/data.h>
  #include <config/ccsession.h>
  
 +#include <server_common/socket_request.h>
 +
  #include <xfr/xfrout_client.h>
  
- #include <auth/change_user.h>
  #include <auth/common.h>
  
  #include <resolver/spec_config.h>