KAZOO-2987: pull request tweaks (no need to create if known system db)