Moving finalization of keyStoreKey setting to the end of the setter
Merge pull request #594 from khawkins/unstable

Moving finalization of keyStoreKey setting to the end of the setter