Merge branch 'master' into sfa-geni-v3

diff --combined system/TestPlc.py
index e001526,807d8a8..6eb2ac9
--- 1/system/TestPlc.py
--- 2/system/TestPlc.py
+++ b/system/TestPlc.py
@@@ -97,7 -97,7 +97,7 @@@ class TestPlc
          'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA,
          'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA,
          'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
 -        'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
 +        'sfi_list@1', 'sfi_show@1', 'sfa_utest@1', SEPSFA,
          # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
          # but as the stress test might take a while, we sometimes missed the debug mode..
          'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
@@@ -183,10 -183,10 +183,10 @@@
          return self.test_ssh.actual_command(self.host_to_guest(command),dry_run=self.options.dry_run)
      
      def start_guest (self):
-       return utils.system(self.test_ssh.actual_command(self.start_guest_in_host()),dry_run=self.options.dry_run)
+       return utils.system(self.test_ssh.actual_command(self.start_guest_in_host(),dry_run=self.options.dry_run))
      
      def stop_guest (self):
-       return utils.system(self.test_ssh.actual_command(self.stop_guest_in_host()),dry_run=self.options.dry_run)
+       return utils.system(self.test_ssh.actual_command(self.stop_guest_in_host(),dry_run=self.options.dry_run))
      
      def run_in_guest (self,command):
          return utils.system(self.actual_command_in_guest(command),dry_run=self.options.dry_run)
@@@ -1514,6 -1514,8 +1514,6 @@@
      @auth_sfa_mapper
      def sfi_show(self): pass
      @auth_sfa_mapper
 -    def sfi_slices(self): pass
 -    @auth_sfa_mapper
      def ssh_slice_sfa(self): pass
      @auth_sfa_mapper
      def sfa_delete_user(self): pass