Simplifies db-bootstrap queries to increase performance on large databases.
Merge branch 'release/2.3' into release/2.4
Merge branch 'release/2.4' of github.com:perfectsense/dari into release/2.4