Fixed the issues reported while testing #7330.#8242

akshay-joshi merged 1 commit intopgadmin-org:masterpgadmin-org/pgadmin4:masterfrom

yogeshmahajan-1903:masteryogeshmahajan-1903/pgadmin4:masterCopy head branch name to clipboard