Merge pull request #6565 from saurabh6790/warehouse_group_account_rename_fix

[fix] warehouse account rename fix #6526