Merge branch 'devel' of github.com:arangodb/arangodb into devel

cmake/FindOpenSSL.cmake

@@ -73,7 +73,8 @@ endif()
 if (WIN32)
   # 32-bit not officially supported anymore anyway
   set(SSL_BITS "x64")
-  set(SSL_NUGET_TARGET "Release/target") # there also is Debug if you want to...
+  set(SSL_NUGET_RELEASE "Release") # there also is Debug if you want to...
+  set(SSL_NUGET_TARGET "${SSL_NUGET_RELEASE}/target")
   # v140 corresponds to VS 2015
   # dynamic dll openssl looks like that...
   #set(SSL_NUGET_DIR "lib/native/v140/windesktop/msvcstl/dyn/rt-dyn")
@@ -543,3 +544,7 @@ endif()
 if(OPENSSL_USE_STATIC_LIBS)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
+
+if (OPENSSL_ROOT_DIR AND SSL_NUGET)
+  set(OPENSSL_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR};${OPENSSL_INCLUDE_DIR}/v140/${SSL_BITS}/${SSL_NUGET_RELEASE}/static/")
+endif()

js/server/upgrade-database.js

@@ -721,7 +721,7 @@
       name: "createFrontend",
       description: "setup _frontend collection",
 
-      system: DATABASE_SYSTEM,
+      system: DATABASE_ALL,
       cluster: [CLUSTER_NONE, CLUSTER_COORDINATOR_GLOBAL],
       database: [DATABASE_INIT, DATABASE_UPGRADE],