Merge branch '2017.7' into 2017.7

salt/states/influxdb_user.py

@@ -41,6 +41,18 @@ def present(name,
         grants:
           foo_db: read
           bar_db: all
+
+    **Example:**
+
+    .. code-block:: yaml
+        example user present in influxdb:
+          influxdb_user.present:
+            - name: example
+            - password: somepassword
+            - admin: False
+            - grants:
+                foo_db: read
+                bar_db: all
     '''
     create = False
     ret = {'name': name,