Resolve "Fix gitlab-psql and gitlab-geo-psql to default to known database based in Omnibus config"

Closes #3485 (closed)

Please merge !2487 (merged) first as this MR is rebased upon that one (because of the docs changes).