Merge branch 'develop' into develop

salt/fileserver/azurefs.py

@@ -265,6 +265,11 @@ def update():
             os.unlink(lk_fn)
         except Exception:
             pass
+        try:
+            hash_cachedir = os.path.join(__opts__['cachedir'], 'azurefs', 'hashes')
+            shutil.rmtree(hash_cachedir)
+        except Exception:
+            log.exception('Problem occurred trying to invalidate hash cach for azurefs')
 
 
 def file_hash(load, fnd):

salt/returners/couchbase_return.py

@@ -265,9 +265,12 @@ def get_load(jid):
     except couchbase.exceptions.NotFoundError:
         return {}
 
-    ret = jid_doc.value['load']
-    if 'minions' in jid_doc.value:
+    ret = {}
+    try:
+        ret = jid_doc.value['load']
         ret['Minions'] = jid_doc.value['minions']
+    except KeyError as e:
+        log.error(e)
 
     return ret