Add error message
Fix UT
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #1015 from andrerod/dev

Add error message for storage key renewal with primary and secondary