Squashed 'root/database/src/main/resources/conf/' content from commit dedd852

git-subtree-dir: root/database/src/main/resources/conf
git-subtree-split: dedd852cdb05ee56c1cf218022f6d080a6f0b48f
Merge commit '96f774a29f31a77c0d9c345cc03f2728fe874040' as 'root/database/src/main/resources/conf'