Merge pull request #2233 from ankitjavalkarwork/fix1004

[fix] Merge permission roles to modify frozen entries/set frozen accounts