merge in changes to rt-setup-database