diff --git a/.dev-tools/distribution_tests_default/centos7/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/centos7/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/centos7/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_default/centos7/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/fedora/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/fedora/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/fedora/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_default/fedora/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/opensuse-leap/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/opensuse-leap/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/opensuse-leap/etc/nginx/vhosts.d/.keep b/.dev-tools/distribution_tests_default/opensuse-leap/etc/nginx/vhosts.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_default/ubuntu-16.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/modules-available/.keep b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/modules-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/modules-enabled/.keep b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/modules-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/centos7/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/unmodified/centos7/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/centos7/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_default/unmodified/centos7/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/fedora/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/unmodified/fedora/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/fedora/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_default/unmodified/fedora/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/opensuse-leap/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/unmodified/opensuse-leap/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/opensuse-leap/etc/nginx/vhosts.d/.keep b/.dev-tools/distribution_tests_default/unmodified/opensuse-leap/etc/nginx/vhosts.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-16.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/modules-available/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/modules-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/modules-enabled/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/modules-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/centos7/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/centos7/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/centos7/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_missing_includes/centos7/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/fedora/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/fedora/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/fedora/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_missing_includes/fedora/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/opensuse-leap/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/opensuse-leap/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/opensuse-leap/etc/nginx/vhosts.d/.keep b/.dev-tools/distribution_tests_missing_includes/opensuse-leap/etc/nginx/vhosts.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-16.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/modules-available/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/modules-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/modules-enabled/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/modules-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/centos7/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/centos7/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/centos7/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/centos7/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/fedora/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/fedora/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/fedora/etc/nginx/default.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/fedora/etc/nginx/default.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/opensuse-leap/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/opensuse-leap/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/opensuse-leap/etc/nginx/vhosts.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/opensuse-leap/etc/nginx/vhosts.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-16.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/conf.d/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/conf.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/modules-available/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/modules-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/modules-enabled/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/modules-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/sites-available/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/sites-available/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/sites-enabled/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/sites-enabled/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/snippets/.keep b/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/etc/nginx/snippets/.keep
new file mode 100644
index 000000000..e69de29bb