Merge upstream v2.7.10 into develop

# Conflicts:
#	.gitignore
#	netbox/dcim/filters.py

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+*.swp
 /netbox/netbox/configuration.py
 /netbox/netbox/ldap_config.py
 /netbox/reports/*
@@ -6,12 +7,10 @@
 /netbox/scripts/*
 !/netbox/scripts/__init__.py
 /netbox/static
-.idea
+/venv/
 /*.sh
 !upgrade.sh
 fabfile.py
-*.swp
-gunicorn_config.py
 gunicorn.py
 netbox.log
 netbox.pid
@@ -20,4 +19,6 @@ netbox.pid
 .venv
 .tox
 !docker/configuration/gunicorn_config.py
+.idea
 .coverage
+.vscode