Merge branch 'master' into trac2353

Conflicts:
	src/bin/bind10/bind10_src.py.in

diff --cc src/bin/bind10/bind10_src.py.in
index e626d7999cd2eaef905b40a5fafb06ffc35f61c6,36ad760e019133c1b125f0878de7f9883a8d0aa3..972498aa10b37b27c935d0c582dee6507023deac
--- 1/src/bin/bind10/bind10_src.py.in
--- 2/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@@ -440,12 -421,9 +436,13 @@@ class BoB
          # Now connect to the c-channel
          cc_connect_start = time.time()
          while self.cc_session is None:
 +            # if we are run under unittests, break
 +            if self._run_under_unittests:
 +                break
 +
              # if we have been trying for "a while" give up
 -            if (time.time() - cc_connect_start) > 5:
 +            if (time.time() - cc_connect_start) > self.msgq_timeout:
+                 logger.error(BIND10_CONNECTING_TO_CC_FAIL)
                  raise CChannelConnectError("Unable to connect to c-channel after 5 seconds")
  
              # try to connect, and if we can't wait a short while