Enhanced loading of database by including the case where a zipped file first contains a folder with the database name.


Former-commit-id: 834f3d1b06803c981a02c16957826d58fc452f53