KFSPTS-3685 Fix issue with ICR accounts being wiped out on copy of
Account and SubAccount (for Account ported fix from 5.2.2 and added a
similar fix for Sub-Account)