Merge branch 'master' into sfa-geni-v3

diff --combined system/TestPlc.py
index 6fa1295,cda7874..3170346
--- 1/system/TestPlc.py
--- 2/system/TestPlc.py
+++ b/system/TestPlc.py
@@@ -92,12 -92,12 +92,12 @@@ class TestPlc
  # keep this our of the way for now
  #        'check_vsys_defaults', SEP,
          'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
-         'qemu_export', 'qemu_kill_mine', 'qemu_start', 'timestamp_qemu', SEP,
+         'qemu_kill_mine','qemu_clean_mine', 'qemu_export', 'qemu_start', 'timestamp_qemu', SEP,
          'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
          '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,
@@@ -115,7 -115,7 +115,7 @@@
          'delete_leases', 'list_leases', SEP,
          'populate', SEP,
          'nodestate_show','nodestate_safeboot','nodestate_boot', SEP,
-         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', 'qemu_clean_mine', SEP,
+         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
        'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
          'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
          'plc_db_dump' , 'plc_db_restore', SEP,
@@@ -387,7 -387,7 +387,7 @@@
          for (box,nodes) in self.get_BoxNodes().iteritems():
              # the fine-grain version
              for node in nodes:
-                 node.clean_qemu()
+                 node.qemu_clean()
          return True
  
      # kill only the right qemus
@@@ -1523,6 -1523,8 +1523,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