Merge "Resolve Bug:654 - Fix config-persister exception handling."