Conflicts: web/src/main/resources/databases.yml web/src/main/webapp/META-INF/autoconf/databases.yml
This reverts commit 5b557b9d.
This reverts commit e0e01bfc.
(cherry picked from commit 4bb1e094)
(cherry picked from commit 5d283c88)
(cherry picked from commit b350c965)
(cherry picked from commit 8f5896d9)
(cherry picked from commit 78c9f3a2)
This reverts commit 2adac8ab.
This reverts commit 952ec654.
