[1443] Merge branch 'master' into merge1443

two options have been added to boss's __init__(), conflict resolved.
Conflicts:
	src/bin/bind10/bind10_src.py.in
	src/bin/bind10/tests/bind10_test.py.in

diff --cc src/bin/bind10/bind10_src.py.in
index ddc6b7dc0580b7ecbbaff179e32ab24233e2ecf0,d002906caae9e7e8c704fbb86b42d28fa7d1e5cf..37b845d5e672dcc36e892dc382bce8663410563c
--- 1/src/bin/bind10/bind10_src.py.in
--- 2/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@@ -167,8 -167,8 +167,9 @@@ class BoB
      """Boss of BIND class."""
      
      def __init__(self, msgq_socket_file=None, data_path=None,
-     config_filename=None, clear_config=False, nocache=False, verbose=False,
 -    config_filename=None, nocache=False, verbose=False, nokill=False,
--    setuid=None, username=None, cmdctl_port=None, wait_time=10):
++                 config_filename=None, clear_config=False, nocache=False,
++                 verbose=False, nokill=False, setuid=None, username=None,
++                 cmdctl_port=None, wait_time=10):
          """
              Initialize the Boss of BIND. This is a singleton (only one can run).
          
@@@ -208,9 -208,9 +209,10 @@@
          self.uid = setuid
          self.username = username
          self.verbose = verbose
+         self.nokill = nokill
          self.data_path = data_path
          self.config_filename = config_filename
 +        self.clear_config = clear_config
          self.cmdctl_port = cmdctl_port
          self.wait_time = wait_time
          self._component_configurator = isc.bind10.component.Configurator(self,
@@@ -1172,9 -1172,9 +1180,10 @@@ def main()
      try:
          # Go bob!
          boss_of_bind = BoB(options.msgq_socket_file, options.data_path,
 -                           options.config_file, options.nocache,
 -                           options.verbose, options.nokill, setuid, username,
 -                           options.cmdctl_port, options.wait_time)
 +                           options.config_file, options.clear_config,
-                            options.nocache, options.verbose, setuid, username,
-                            options.cmdctl_port, options.wait_time)
++                           options.nocache, options.verbose, options.nokill,
++                           setuid, username, options.cmdctl_port,
++                           options.wait_time)
          startup_result = boss_of_bind.startup()
          if startup_result:
              logger.fatal(BIND10_STARTUP_ERROR, startup_result)

diff --cc src/bin/bind10/tests/bind10_test.py.in
index 6633b68a1ef9225b19ea88a9b90233d820ec3af2,fa01d11cea7eee84dfe3e8f25ff20622f2c1eddf..0f397ae0d24faffc43efbe006071840662a26f56
--- 1/src/bin/bind10/tests/bind10_test.py.in
--- 2/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@@ -1012,12 -1012,16 +1012,22 @@@ class TestParseArgs(unittest.TestCase)
          options = parse_args(['--config-file=config-file'], TestOptParser)
          self.assertEqual('config-file', options.config_file)
  
 +    def test_clear_config(self):
 +        options = parse_args([], TestOptParser)
 +        self.assertEqual(False, options.clear_config)
 +        options = parse_args(['--clear-config'], TestOptParser)
 +        self.assertEqual(True, options.clear_config)
 +
+     def test_nokill(self):
+         options = parse_args([], TestOptParser)
+         self.assertEqual(False, options.nokill)
+         options = parse_args(['--no-kill'], TestOptParser)
+         self.assertEqual(True, options.nokill)
+         options = parse_args([], TestOptParser)
+         self.assertEqual(False, options.nokill)
+         options = parse_args(['-i'], TestOptParser)
+         self.assertEqual(True, options.nokill)
+ 
      def test_cmdctl_port(self):
          """
          Test it can parse the command control port.