Merge remote-tracking branch 'origin/master' into vue_react_migration

# Conflicts:
#	src/common/cluster-store.ts
#	src/common/cluster-store_spec.ts

src/renderer/_vue/store/modules/kube-contexts.js

@@ -6,10 +6,10 @@ const state = {
 }
 
 const actions = {
-  reloadAvailableKubeContexts: ({commit}) => {
+  reloadAvailableKubeContexts({commit}, file) {
     let kc = new k8s.KubeConfig();
     try {
-      kc.loadFromDefault();
+      kc.loadFromFile(file);
     } catch (error) {
       console.error("Failed to read default kubeconfig: " + error.message);
     }