[trac781] Merge branch 'trac781' of ssh://bind10.isc.org/var/bind10/git/bind10 into trac781

Conflicts:
	src/lib/dns/tsigkey.cc

src/lib/Makefile.am

-SUBDIRS = exceptions crypto dns cc config python xfr bench log \
+SUBDIRS = exceptions dns crypto cc config python xfr bench log \
           asiolink nsas cache resolve testutils datasrc server_common

src/lib/dns/tsigkey.cc

@@ -156,8 +156,8 @@ TSIGKey::toText() const {
     }
     std::string secret_str = encodeBase64(secret_v);
 
-    return getKeyName().toText() + ":" + secret_str + ":" +
-           getAlgorithmName().toText();
+    return (getKeyName().toText() + ":" + secret_str + ":" +
+            getAlgorithmName().toText());
 }
 
 const